diff --git a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll index 0f2845f48..aa2a5f96b 100644 Binary files a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll and b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll differ diff --git a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll index a6195289b..ade0e298f 100644 Binary files a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll and b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll differ diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs index 84075a41a..d88f21521 100644 --- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs +++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs @@ -54,10 +54,7 @@ public async ValueTask WillStartAsync() analyticsClient.CaptureEvent(new AnalyticsEvent() { - ChainId = analyticsClient.ChainConfig.ChainId, - Network = analyticsClient.ChainConfig.Network, EventName = $"Web3Auth Initialized", - ProjectId = analyticsClient.ProjectConfig.ProjectId, PackageName = "io.chainsafe.web3-unity.web3auth", }); coreInstance = CreateCoreInstance(); diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll index c49e4dea3..5cac3e799 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll index 4526b6588..f52b1cb38 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll index 0b955aacb..5da2e115f 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll index bb895c44b..1a1143e07 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll index 309ef582a..281e190b6 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll index 002e75eff..5590de49f 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll index 00fcc0c36..b054a07b4 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll index efbb7557c..d6c8efaf2 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll index 12628bc49..3f7f29ac7 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll index 4ba2c7487..eb3781f3a 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll index 6272cfcdb..c222ab96b 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll index 25ab1b055..51dcfbdac 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll index 8663817c6..32389be38 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll index 639f5c4e6..463a5e65e 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/CountlyAnalytics.cs b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/CountlyAnalytics.cs index 90ba4415e..b4d691aaa 100644 --- a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/CountlyAnalytics.cs +++ b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/CountlyAnalytics.cs @@ -14,24 +14,27 @@ public class CountlyAnalytics : IAnalyticsClient public async void CaptureEvent(AnalyticsEvent eventData) { - await Countly.Instance.Events.RecordEventAsync(eventData.EventName, new Dictionary() - { - { "chain", eventData.ChainId}, - { "network", eventData.Network}, - { "project-id", eventData.ProjectId}, - { "rpc ", eventData.Rpc}, - { "version", AnalyticsVersion}, - }); + await Countly.Instance.Events.RecordEventAsync(eventData.EventName); } - public string AnalyticsVersion => "2.5.5"; + public string AnalyticsVersion => "2.6"; public IChainConfig ChainConfig { get; } public IProjectConfig ProjectConfig { get; } public CountlyAnalytics(IChainConfig chainConfig, IProjectConfig projectConfig) { Countly.Instance.Init(new CountlyConfiguration(AppKey, ServerUrl)); - Debug.Log("Countly initialized"); + + var userDetails = new Dictionary + { + { "chainId", chainConfig.ChainId }, + { "rpc", chainConfig.Rpc }, + { "network", chainConfig.Network }, + { "projectId", projectConfig.ProjectId }, + { "analyticsVersion", AnalyticsVersion } + }; + + Countly.Instance.UserDetails.SetCustomUserDetails(userDetails); ChainConfig = chainConfig; ProjectConfig = projectConfig; diff --git a/src/ChainSafe.Gaming.Gelato/Gelato.cs b/src/ChainSafe.Gaming.Gelato/Gelato.cs index 1aaf60bb3..9eebd1383 100644 --- a/src/ChainSafe.Gaming.Gelato/Gelato.cs +++ b/src/ChainSafe.Gaming.Gelato/Gelato.cs @@ -57,10 +57,7 @@ public async ValueTask WillStartAsync() analyticsClient.CaptureEvent(new AnalyticsEvent() { - ChainId = chainConfig.ChainId, - Network = chainConfig.Network, EventName = $"Gelato initialized", - ProjectId = projectConfig.ProjectId, PackageName = "io.chainsafe.web3-unity", }); } diff --git a/src/ChainSafe.Gaming.Gelato/GelatoClient.cs b/src/ChainSafe.Gaming.Gelato/GelatoClient.cs index 15de4bc2f..6587b4f07 100644 --- a/src/ChainSafe.Gaming.Gelato/GelatoClient.cs +++ b/src/ChainSafe.Gaming.Gelato/GelatoClient.cs @@ -52,10 +52,7 @@ public async Task Post(RelayCall relayCall, TReq }; analyticsClient.CaptureEvent(new AnalyticsEvent() { - ChainId = chainConfig.ChainId, - Network = chainConfig.Network, EventName = $"{relayCall}", - ProjectId = projectConfig.ProjectId, PackageName = "io.chainsafe.web3-unity", }); diff --git a/src/ChainSafe.Gaming.Lootboxes.Chainlink/LootboxService.cs b/src/ChainSafe.Gaming.Lootboxes.Chainlink/LootboxService.cs index 0c39f2bf5..fe637f17c 100644 --- a/src/ChainSafe.Gaming.Lootboxes.Chainlink/LootboxService.cs +++ b/src/ChainSafe.Gaming.Lootboxes.Chainlink/LootboxService.cs @@ -71,13 +71,8 @@ async ValueTask ILifecycleParticipant.WillStartAsync() analyticsClient.CaptureEvent(new AnalyticsEvent() { - ProjectId = projectConfig.ProjectId, - Network = chainConfig.Network, - ChainId = chainConfig.ChainId, - Rpc = chainConfig.Rpc, EventName = "Lootboxes Initialized", PackageName = "io.chainsafe.web3-unity.lootboxes", - Version = analyticsClient.AnalyticsVersion, }); // todo check if contract is correct diff --git a/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProvider.cs b/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProvider.cs index e07321c79..fbfe64000 100644 --- a/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProvider.cs +++ b/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProvider.cs @@ -83,13 +83,8 @@ public override async Task Connect() analyticsClient.CaptureEvent(new AnalyticsEvent() { - ProjectId = projectConfig.ProjectId, - Network = chainConfig.Network, - ChainId = chainConfig.ChainId, - Rpc = chainConfig.Rpc, EventName = "Metamask WebGL Initialized", PackageName = "io.chainsafe.web3-unity", - Version = analyticsClient.AnalyticsVersion, }); return await metaMaskController.Connect(); diff --git a/src/ChainSafe.Gaming.SygmaClient/Types/IFeeHandlerRouter.cs b/src/ChainSafe.Gaming.SygmaClient/Types/IFeeHandlerRouter.cs index 9641184f4..852b52be4 100644 --- a/src/ChainSafe.Gaming.SygmaClient/Types/IFeeHandlerRouter.cs +++ b/src/ChainSafe.Gaming.SygmaClient/Types/IFeeHandlerRouter.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using NBitcoin; namespace ChainSafe.Gaming.SygmaClient.Types { diff --git a/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs b/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs index 121dc4174..45eeda7e8 100644 --- a/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs +++ b/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs @@ -85,13 +85,8 @@ async ValueTask ILifecycleParticipant.WillStartAsync() { analyticsClient.CaptureEvent(new AnalyticsEvent() { - ProjectId = analyticsClient.ProjectConfig.ProjectId, - Network = analyticsClient.ChainConfig.Network, - ChainId = analyticsClient.ChainConfig.ChainId, - Rpc = analyticsClient.ChainConfig.Rpc, EventName = "Wallet Connect Initialized", PackageName = "io.chainsafe.web3-unity", - Version = analyticsClient.AnalyticsVersion, }); ValidateConfig(); diff --git a/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs b/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs index cde249870..b9215f538 100644 --- a/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs +++ b/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs @@ -92,12 +92,8 @@ public async Task Call(string method, object[] parameters = null, Tran var result = await provider.Call(txReq); analyticsClient.CaptureEvent(new AnalyticsEvent() { - ChainId = analyticsClient.ChainConfig.ChainId, EventName = method, - Network = analyticsClient.ChainConfig.Network, - Version = analyticsClient.AnalyticsVersion, PackageName = "io.chainsafe.web3.unity", - ProjectId = analyticsClient.ProjectConfig.ProjectId, }); return Decode(method, result); @@ -170,12 +166,8 @@ public async Task Send(string method, object[] parameters = null, Tran analyticsClient.CaptureEvent(new AnalyticsEvent() { - ChainId = analyticsClient.ChainConfig.ChainId, EventName = method, - Network = analyticsClient.ChainConfig.Network, - Version = analyticsClient.AnalyticsVersion, PackageName = "io.chainsafe.web3.unity", - ProjectId = analyticsClient.ProjectConfig.ProjectId, }); return (outputValues, receipt); @@ -245,12 +237,8 @@ public string Calldata(string method, object[] parameters = null) analyticsClient.CaptureEvent(new AnalyticsEvent() { - ChainId = analyticsClient.ChainConfig.ChainId, EventName = method, - Network = analyticsClient.ChainConfig.Network, - Version = analyticsClient.AnalyticsVersion, PackageName = "io.chainsafe.web3.unity", - ProjectId = analyticsClient.ProjectConfig.ProjectId, }); return function.GetData(parameters); diff --git a/src/ChainSafe.Gaming/Web3/Core/Analytics/AnalyticsEvent.cs b/src/ChainSafe.Gaming/Web3/Core/Analytics/AnalyticsEvent.cs index b2529669a..83e9d3636 100644 --- a/src/ChainSafe.Gaming/Web3/Core/Analytics/AnalyticsEvent.cs +++ b/src/ChainSafe.Gaming/Web3/Core/Analytics/AnalyticsEvent.cs @@ -4,21 +4,6 @@ namespace ChainSafe.Gaming.Web3.Analytics { public class AnalyticsEvent { - [JsonProperty(PropertyName = "projectId", NullValueHandling = NullValueHandling.Ignore)] - public string ProjectId { get; set; } - - [JsonProperty(PropertyName = "chain", NullValueHandling = NullValueHandling.Ignore)] - public string ChainId { get; set; } - - [JsonProperty(PropertyName = "rpc", NullValueHandling = NullValueHandling.Ignore)] - public string Rpc { get; set; } - - [JsonProperty(PropertyName = "network", NullValueHandling = NullValueHandling.Ignore)] - public string Network { get; set; } - - [JsonProperty(PropertyName = "version", NullValueHandling = NullValueHandling.Ignore)] - public string Version { get; set; } - [JsonProperty(PropertyName = "gameData", NullValueHandling = NullValueHandling.Ignore)] public AnalyticsGameData GameData { get; set; } diff --git a/src/ChainSafe.Gaming/Web3/Core/Analytics/ApiAnalyticsClient.cs b/src/ChainSafe.Gaming/Web3/Core/Analytics/ApiAnalyticsClient.cs index ef897e005..6b3099b42 100644 --- a/src/ChainSafe.Gaming/Web3/Core/Analytics/ApiAnalyticsClient.cs +++ b/src/ChainSafe.Gaming/Web3/Core/Analytics/ApiAnalyticsClient.cs @@ -25,11 +25,6 @@ public ApiAnalyticsClient(IProjectConfig projectConfig, IChainConfig chainConfig public async void CaptureEvent(AnalyticsEvent eventData) { - eventData.ProjectId ??= ProjectConfig.ProjectId; - eventData.ChainId ??= ChainConfig.ChainId; - eventData.Network ??= ChainConfig.Network; - eventData.Version = AnalyticsVersion; - await httpClient.PostRaw(LoggingUrl, JsonConvert.SerializeObject(eventData), "application/json"); } } diff --git a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs b/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs index 5a902ad18..67dbbef26 100644 --- a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs +++ b/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs @@ -125,9 +125,6 @@ public async Task Perform(string method, params object[] parameters) { environment.AnalyticsClient.CaptureEvent(new AnalyticsEvent() { - Rpc = method, - Network = network?.Name, - ChainId = network?.ChainId.ToString(), EventName = $"{method}", GameData = new AnalyticsGameData() { diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth/2.5.1/Web3.Unity Web3Auth Samples/Scripts/Web3AuthLoginProvider.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth/2.5.1/Web3.Unity Web3Auth Samples/Scripts/Web3AuthLoginProvider.cs index 065be2035..e163b82b9 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth/2.5.1/Web3.Unity Web3Auth Samples/Scripts/Web3AuthLoginProvider.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK Web3Auth/2.5.1/Web3.Unity Web3Auth Samples/Scripts/Web3AuthLoginProvider.cs @@ -95,11 +95,7 @@ private void LogAnalytics(Provider provider) IAnalyticsClient client = (IAnalyticsClient)Web3Accessor.Web3.ServiceProvider.GetService(typeof(IAnalyticsClient)); client.CaptureEvent(new AnalyticsEvent() { - ChainId = Web3Accessor.Web3.ChainConfig.ChainId, - Network = Web3Accessor.Web3.ChainConfig.Network, - ProjectId = Web3Accessor.Web3.ProjectConfig.ProjectId, EventName = $"Login provider {provider}", - Version = client.AnalyticsVersion, PackageName = "io.chainsafe.web3-unity.web3auth", }); }