Lint Fixes

Author: rob1997

src/ChainSafe.Gaming.Lootboxes.Chainlink/LootboxService.cs

@@ -9,7 +9,6 @@
 using ChainSafe.Gaming.Evm.Signers;
 using ChainSafe.Gaming.Evm.Transactions;
 using ChainSafe.Gaming.Web3;
- 
 using ChainSafe.Gaming.Web3.Core;
 using ChainSafe.Gaming.Web3.Core.Debug;
 using ChainSafe.Gaming.Web3.Environment;
@@ -32,22 +31,15 @@ public class LootboxService : ILootboxService, ILifecycleParticipant
         private Contract contract;
         private Dictionary<string, RewardType> rewardTypeByTokenAddress;
 
-        public LootboxService(
-            LootboxServiceConfig config,
-            IContractBuilder contractBuilder,
-            IRpcProvider rpcProvider)
+        public LootboxService(LootboxServiceConfig config, IContractBuilder contractBuilder, IRpcProvider rpcProvider)
         {
             this.rpcProvider = rpcProvider;
             this.config = config;
             this.contractBuilder = contractBuilder;
         }
 
-        public LootboxService(
-            LootboxServiceConfig config,
-            IContractBuilder contractBuilder,
-            IRpcProvider rpcProvider,
-            ISigner signer)
-            : this(config, contractBuilder, rpcProvider)
+        public LootboxService(LootboxServiceConfig config, IContractBuilder contractBuilder, IRpcProvider rpcProvider,
+            ISigner signer) : this(config, contractBuilder, rpcProvider)
         {
             this.signer = signer;
         }
@@ -92,8 +84,7 @@ public async Task<List<uint>> GetLootboxTypes()
 
             if (bigIntTypes.Any(v => v > int.MaxValue))
             {
-                throw new Web3Exception(
-                    "Internal Error. Lootbox type is greater than int.MaxValue.");
+                throw new Web3Exception("Internal Error. Lootbox type is greater than int.MaxValue.");
             }
 
             var types = bigIntTypes.Select(bigInt => (uint)bigInt).ToList();
@@ -110,15 +101,12 @@ public async Task<uint> BalanceOf(uint lootboxType)
 
         public async Task<uint> BalanceOf(string account, uint lootboxType)
         {
-            var response = await this.contract.Call(
-                "balanceOf",
-                new object[] { account, lootboxType });
+            var response = await this.contract.Call("balanceOf", new object[] { account, lootboxType });
             var bigIntBalance = (BigInteger)response[0];
 
             if (bigIntBalance > int.MaxValue)
             {
-                throw new Web3Exception(
-                    "Internal Error. Balance is greater than int.MaxValue.");
+                throw new Web3Exception("Internal Error. Balance is greater than int.MaxValue.");
             }
 
             var balance = (uint)bigIntBalance;
@@ -132,8 +120,7 @@ public async Task<BigInteger> CalculateOpenPrice(uint lootboxType, uint lootboxC
             var rawGasPrice = (await this.rpcProvider.GetGasPrice()).AssertNotNull("gasPrice").Value;
             var safeGasPrice = (rawGasPrice * 2) + BigInteger.Divide(rawGasPrice, new BigInteger(2)); // 300%
 
-            var response = await this.contract.Call(
-                "calculateOpenPrice",
+            var response = await this.contract.Call("calculateOpenPrice",
                 new object[] { 50000 + (GasPerUnit * rewardCount), safeGasPrice, rewardCount, });
             var openPrice = (BigInteger)response[0];
 
@@ -153,17 +140,17 @@ public async Task<uint> OpeningLootboxType()
             var playerAddress = this.GetCurrentPlayerAddress();
 
             // This response is actually very different from all the others since it returns several components
-            var response = (List<ParameterOutput>)(await this.contract.Call("getOpenerRequestDetails", new object[] { playerAddress }))[0];
+            var response =
+                (List<ParameterOutput>)(await this.contract.Call("getOpenerRequestDetails",
+                    new object[] { playerAddress }))[0];
             var address = (string)response[0].Result;
             var unitsToGet = (BigInteger)response[1].Result;
             var lootboxType = ((List<BigInteger>)response[2].Result)[0];
             if (!string.IsNullOrEmpty(address) && unitsToGet == 0)
             {
                 // we can early return here, but, it's not necessary since unitstoget will be 0 regardless and this
                 // call will fulfill every request that's been missing.
-                await this.contract.Send(
-                    "recoverBoxes",
-                    new object[] { playerAddress });
+                await this.contract.Send("recoverBoxes", new object[] { playerAddress });
             }
 
             if (unitsToGet > uint.MaxValue)
@@ -179,8 +166,7 @@ public async Task OpenLootbox(uint lootboxType, uint lootboxCount = 1)
             var rewardCount = lootboxType * lootboxCount;
             var openPrice = await this.CalculateOpenPrice(lootboxCount, lootboxCount);
 
-            await this.contract.Send(
-                "open",
+            await this.contract.Send("open",
                 new object[] { 50000 + (GasPerUnit * rewardCount), new[] { lootboxType }, new[] { lootboxCount } },
                 new TransactionRequest { Value = new HexBigInteger(openPrice) });
         }
@@ -194,9 +180,7 @@ public async Task<bool> CanClaimRewards()
 
         public async Task<bool> CanClaimRewards(string account)
         {
-            var response = await this.contract.Call(
-                "canClaimRewards",
-                new object[] { account });
+            var response = await this.contract.Call("canClaimRewards", new object[] { account });
             var canClaimRewards = (bool)response[0];
 
             return canClaimRewards;
@@ -214,9 +198,7 @@ public async Task<LootboxRewards> ClaimRewards(string account)
             var (_, receipt) = await this.contract.SendWithReceipt("claimRewards", new object[] { account });
             var logs = receipt.Logs.Select(jToken => JsonConvert.DeserializeObject<FilterLog>(jToken.ToString()));
             var eventAbi = EventExtensions.GetEventABI<RewardsClaimedEvent>();
-            var eventLogs = logs
-                .Select(log => eventAbi.DecodeEvent<RewardsClaimedEvent>(log))
-                .Where(l => l != null);
+            var eventLogs = logs.Select(log => eventAbi.DecodeEvent<RewardsClaimedEvent>(log)).Where(l => l != null);
 
             if (!eventLogs.Any())
             {
@@ -239,15 +221,13 @@ LootboxRewards ExtractRewards(IEnumerable<EventLog<RewardsClaimedEvent>> eventLo
                         case RewardType.Erc20:
                             rewards.Erc20Rewards.Add(new Erc20Reward
                             {
-                                ContractAddress = eventData.TokenAddress,
-                                AmountRaw = eventData.Amount,
+                                ContractAddress = eventData.TokenAddress, AmountRaw = eventData.Amount,
                             });
                             break;
                         case RewardType.Erc721:
                             rewards.Erc721Rewards.Add(new Erc721Reward
                             {
-                                ContractAddress = eventData.TokenAddress,
-                                TokenId = eventData.TokenId,
+                                ContractAddress = eventData.TokenAddress, TokenId = eventData.TokenId,
                             });
                             break;
                         case RewardType.Erc1155:
@@ -261,8 +241,7 @@ LootboxRewards ExtractRewards(IEnumerable<EventLog<RewardsClaimedEvent>> eventLo
                         case RewardType.Erc1155Nft:
                             rewards.Erc1155NftRewards.Add(new Erc1155NftReward
                             {
-                                ContractAddress = eventData.TokenAddress,
-                                TokenId = eventData.TokenId,
+                                ContractAddress = eventData.TokenAddress, TokenId = eventData.TokenId,
                             });
                             break;
                         case RewardType.Unset:

src/ChainSafe.Gaming.Unity.MetaMask/MetaMaskProvider.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using ChainSafe.Gaming.Evm;
 using ChainSafe.Gaming.Web3;
- 
 using ChainSafe.Gaming.Web3.Environment;
 using ChainSafe.Gaming.Web3.Evm.Wallet;
 using UnityEngine;
@@ -26,8 +25,8 @@ public class MetaMaskProvider : WalletProvider
         /// <param name="environment">Injected <see cref="Web3Environment"/>.</param>
         /// <param name="chainConfig">Injected <see cref="IChainConfig"/>.</param>
         /// <param name="chainRegistryProvider">Injected <see cref="ChainRegistryProvider"/>.</param>
-        public MetaMaskProvider(Web3Environment environment, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider)
-            : base(environment, chainConfig)
+        public MetaMaskProvider(Web3Environment environment, IChainConfig chainConfig,
+            ChainRegistryProvider chainRegistryProvider) : base(environment, chainConfig)
         {
             logWriter = environment.LogWriter;
             this.chainConfig = chainConfig;
@@ -76,7 +75,6 @@ public override async Task<string> Connect()
         {
             logWriter.Log("Connecting from Metamask...");
 
-
             return await metaMaskController.Connect(chainConfig, chainRegistryProvider);
         }
     }

src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs

@@ -9,7 +9,6 @@
 using ChainSafe.Gaming.WalletConnect.Storage;
 using ChainSafe.Gaming.WalletConnect.Wallets;
 using ChainSafe.Gaming.Web3;
- 
 using ChainSafe.Gaming.Web3.Core;
 using ChainSafe.Gaming.Web3.Core.Debug;
 using ChainSafe.Gaming.Web3.Environment;
@@ -55,14 +54,9 @@ public class WalletConnectProvider : WalletProvider, ILifecycleParticipant, ICon
         private bool initialized;
         private ConnectionHandlerConfig connectionHandlerConfig;
 
-        public WalletConnectProvider(
-            IWalletConnectConfig config,
-            DataStorage storage,
-            IChainConfig chainConfig,
-            IWalletRegistry walletRegistry,
-            RedirectionHandler redirection,
-            Web3Environment environment)
-            : base(environment, chainConfig)
+        public WalletConnectProvider(IWalletConnectConfig config, DataStorage storage, IChainConfig chainConfig,
+            IWalletRegistry walletRegistry, RedirectionHandler redirection, Web3Environment environment) : base(
+            environment, chainConfig)
         {
             this.redirection = redirection;
             this.walletRegistry = walletRegistry;
@@ -92,14 +86,11 @@ private async Task Initialize()
                 return;
             }
 
-
             ValidateConfig();
 
             WCLogger.Logger = new WCLogWriter(logWriter, config);
 
-            localData = !config.ForceNewSession
-                ? await storage.LoadLocalData() ?? new LocalData()
-                : new LocalData();
+            localData = !config.ForceNewSession ? await storage.LoadLocalData() ?? new LocalData() : new LocalData();
 
             core = new WalletConnectCore(new CoreOptions
             {
@@ -132,13 +123,8 @@ private async Task Initialize()
                         Events = new[] { "chainChanged", "accountsChanged" },
                         Methods = new[]
                         {
-                            "eth_sign",
-                            "personal_sign",
-                            "eth_signTypedData",
-                            "eth_signTransaction",
-                            "eth_sendTransaction",
-                            "eth_getTransactionByHash",
-                            "wallet_switchEthereumChain",
+                            "eth_sign", "personal_sign", "eth_signTypedData", "eth_signTransaction",
+                            "eth_sendTransaction", "eth_getTransactionByHash", "wallet_switchEthereumChain",
                             "eth_blockNumber",
                         },
                     }
@@ -186,17 +172,16 @@ public override async Task<string> Connect()
             {
                 var sessionStored = !string.IsNullOrEmpty(localData.SessionTopic);
 
-                session = !sessionStored
-                    ? await ConnectSession()
-                    : await RestoreSession();
+                session = !sessionStored ? await ConnectSession() : await RestoreSession();
 
                 localData.SessionTopic = session.Topic;
 
                 var sessionLocalWallet = GetSessionLocalWallet();
                 if (sessionLocalWallet != null)
                 {
                     localData.ConnectedLocalWalletName = sessionLocalWallet.Name;
-                    WCLogger.Log($"\"{sessionLocalWallet.Name}\" set as locally connected wallet for the current session.");
+                    WCLogger.Log(
+                        $"\"{sessionLocalWallet.Name}\" set as locally connected wallet for the current session.");
                 }
                 else
                 {
@@ -295,7 +280,8 @@ private async Task<SessionStruct> ConnectSession()
         {
             if (config.ConnectionHandlerProvider == null)
             {
-                throw new WalletConnectException($"Can not connect to a new session. No {nameof(IConnectionHandlerProvider)} was set in config.");
+                throw new WalletConnectException(
+                    $"Can not connect to a new session. No {nameof(IConnectionHandlerProvider)} was set in config.");
             }
 
             var connectOptions = new ConnectOptions { RequiredNamespaces = requiredNamespaces };
@@ -310,16 +296,14 @@ private async Task<SessionStruct> ConnectSession()
                     ConnectRemoteWalletUri = connectedData.Uri,
                     DelegateLocalWalletSelectionToOs = OsManageWalletSelection,
                     WalletLocationOption = config.WalletLocationOption,
-
                     LocalWalletOptions = !OsManageWalletSelection
                         ? walletRegistry.EnumerateSupportedWallets(osMediator.Platform)
                             .ToList() // todo notify devs that some wallets don't work on Desktop
                         : null,
-
-                    RedirectToWallet = !OsManageWalletSelection
-                        ? walletName => redirection.RedirectConnection(connectedData.Uri, walletName)
-                        : null,
-
+                    RedirectToWallet =
+                        !OsManageWalletSelection
+                            ? walletName => redirection.RedirectConnection(connectedData.Uri, walletName)
+                            : null,
                     RedirectOsManaged = OsManageWalletSelection
                         ? () => redirection.RedirectConnectionOsManaged(connectedData.Uri)
                         : null,
@@ -405,8 +389,7 @@ public override async Task<T> Request<T>(string method, params object[] paramete
 
             var sessionTopic = session.Topic;
 
-            EventUtils.ListenOnce<PublishParams>(
-                OnPublishedMessage,
+            EventUtils.ListenOnce<PublishParams>(OnPublishedMessage,
                 handler => core.Relayer.Publisher.OnPublishedMessage += handler,
                 handler => core.Relayer.Publisher.OnPublishedMessage -= handler);
 
@@ -434,17 +417,14 @@ private WalletModel GetSessionLocalWallet()
         {
             var nativeUrl = RemoveSlash(session.Peer.Metadata.Url);
 
-            var sessionWallet = walletRegistry
-                .EnumerateSupportedWallets(osMediator.Platform)
+            var sessionWallet = walletRegistry.EnumerateSupportedWallets(osMediator.Platform)
                 .FirstOrDefault(w => RemoveSlash(w.Homepage) == nativeUrl);
 
             return sessionWallet;
 
             string RemoveSlash(string s)
             {
-                return s.EndsWith('/')
-                    ? s[..s.LastIndexOf('/')]
-                    : s;
+                return s.EndsWith('/') ? s[..s.LastIndexOf('/')] : s;
             }
         }
 
@@ -488,7 +468,8 @@ private string GetFullAddress()
             return defaultNamespace.Accounts[0];
         }
 
-        private async Task<T> WalletConnectRequest<T>(string topic, string method, string chainId, params object[] parameters)
+        private async Task<T> WalletConnectRequest<T>(string topic, string method, string chainId,
+            params object[] parameters)
         {
             // Helper method to make a request using WalletConnectSignClient.
             async Task<T> MakeRequest<TRequest>()
@@ -518,11 +499,14 @@ async Task<T> MakeRequest<TRequest>()
                         // Using WalletConnect Blockchain API: https://docs.walletconnect.com/cloud/blockchain-api
                         var url = $"https://rpc.walletconnect.com/v1?chainId={chain}&projectId={config.ProjectId}";
 
-                        string body = JsonConvert.SerializeObject(new RpcRequestMessage(Guid.NewGuid().ToString(), method, parameters));
+                        string body =
+                            JsonConvert.SerializeObject(new RpcRequestMessage(Guid.NewGuid().ToString(), method,
+                                parameters));
 
                         var rawResult = await httpClient.PostRaw(url, body, "application/json");
 
-                        RpcResponseMessage response = JsonConvert.DeserializeObject<RpcResponseMessage>(rawResult.Response);
+                        RpcResponseMessage response =
+                            JsonConvert.DeserializeObject<RpcResponseMessage>(rawResult.Response);
 
                         return response.Result.ToObject<T>();
                     }