Merge pull request #55 from KristiforMilchev/development

Code refactoring

Author: KristiforMilchev

Data/AuthenicationHandler.cs

@@ -13,18 +13,20 @@ public class AuthenicationHandler : IAuthenicationService
     IUtilities Utilities { get; set; }
     IContractService ContractService { get; set; }
     IHardwareService HardwareService { get; set; }
+    ICommunication Communication { get; set; }
     public AuthenicationHandler()
     {
         Utilities = ServiceHelper.GetService<IUtilities>();
         ContractService = ServiceHelper.GetService<IContractService>();
         HardwareService = ServiceHelper.GetService<IHardwareService>();
+        Communication = ServiceHelper.GetService<ICommunication>();
     }
 
 
     public string GetDefault()
     {
         //WIP
-        return MauiProgram.PublicAddress;
+        return Communication.PublicAddress;
     }
 
     public bool SetupNetwork(string networkName, string networkSymbol, string rpcUrl, int chainID, string blockExplorer)
@@ -100,14 +102,14 @@ public bool ImportToken(string contractAddress, string symbol, int delimiter, in
 
     public Account  UnlockWallet(string pass)
     {
-         var privateKey = HardwareService.DecryptAesEncoded(MauiProgram.PK, pass);
+         var privateKey = HardwareService.DecryptAesEncoded(Communication.PK, pass);
 
         if (string.IsNullOrEmpty(privateKey))
             return null;
 
         var chainId = 97;
-        if (MauiProgram.ActiveNetwork != null)
-            chainId = MauiProgram.ActiveNetwork.Chainid;
+        if (Communication.ActiveNetwork != null)
+            chainId = Communication.ActiveNetwork.Chainid;
 
 
         var wallet = new Account(privateKey, chainId);

Data/ContractService.cs

@@ -17,16 +17,18 @@ internal class ContractService : IContractService
     {
 
         IUtilities Utilities { get; set; }
+        ICommunication Communication { get; set; }
         public ContractService()
         {
             Utilities = ServiceHelper.GetService<IUtilities>();
+            Communication = ServiceHelper.GetService<ICommunication>();
         }
 
         public async Task<decimal> GetAccountBalance(string endpoint)
         {
             try
             {
-                var publicKey = MauiProgram.PublicAddress;
+                var publicKey = Communication.PublicAddress;
                 var web3 = new Nethereum.Web3.Web3(endpoint);
                 var balance = await web3.Eth.GetBalance.SendRequestAsync(publicKey);
                 var etherAmount = Web3.Convert.FromWei(balance.Value);
@@ -144,14 +146,14 @@ public async Task<decimal> CheckUserBalanceForContract(string ownerAddress, stri
         public async Task<List<Token>> GetNetworkTokens(int networkId)
         {
             // On startup, it gets thge list of officially supported tokens by running a query against githubs API
-            if(MauiProgram.ListedTokens == null)
-                MauiProgram.ListedTokens = await Utilities.GetRequest<List<ListedToken>>($"https://api.github.com/repos/KristiforMilchev/LInksync-Cold-Storage-Wallet/contents/Models/Tokens");
+            if(Communication.ListedTokens == null)
+                Communication.ListedTokens = await Utilities.GetRequest<List<ListedToken>>($"https://api.github.com/repos/KristiforMilchev/LInksync-Cold-Storage-Wallet/contents/Models/Tokens");
 
             //Define a local collection of token.
             var tokens = new List<Token>();
 
             //Check if the selected network exists
-            var getNetworkData = MauiProgram.NetworkSettings.FirstOrDefault(x => x.Id == networkId && x.IsProduction == MauiProgram.IsDevelopment);
+            var getNetworkData = Communication.NetworkSettings.FirstOrDefault(x => x.Id == networkId && x.IsProduction == Communication.IsDevelopment);
 
             //In case it exists we add the native token to the list and run a query to get the user balance of the token.
             if(getNetworkData != null)
@@ -176,7 +178,7 @@ public async Task<List<Token>> GetNetworkTokens(int networkId)
             }
 
             //Gets the list of officially supported tokens on the selected network, as it binds user balance, market cap, price, and circulating supply for each token.
-            tokens = await GetListedTokens(MauiProgram.ListedTokens, tokens, getNetworkData);
+            tokens = await GetListedTokens(Communication.ListedTokens, tokens, getNetworkData);
 
             //Checks if the user has imported tokens in case it the file doesn't exists it creates a blank one.
             if (!File.Exists($"{Utilities.GetOsSavePath()}/LocalTokens.json"))
@@ -315,7 +317,7 @@ public async Task<decimal> CheckExistingSupply(string contractAddress, string en
 
         public async Task<decimal> GetImportedData(NetworkSettings network, TokenContract getContract)
         {
-            return await CheckUserBalanceForContract(MauiProgram.PublicAddress, getContract.ContractAddress, network.Endpoint, getContract.Decimals);
+            return await CheckUserBalanceForContract(Communication.PublicAddress, getContract.ContractAddress, network.Endpoint, getContract.Decimals);
         }
 
         public async Task<List<Token>> GetListedTokens(List<ListedToken> listedTokenData, List<Token> tokens, NetworkSettings network)
@@ -337,7 +339,7 @@ public async Task<List<Token>> GetListedTokens(List<ListedToken> listedTokenData
                 if(getContract != null)
                 {
                     //Check the user balance of the given contract
-                    getContract.UserBalance = await CheckUserBalanceForContract(MauiProgram.PublicAddress, getContract.ContractAddress, network.Endpoint, getContract.Decimals);
+                    getContract.UserBalance = await CheckUserBalanceForContract(Communication.PublicAddress, getContract.ContractAddress, network.Endpoint, getContract.Decimals);
                     //Get the contract native price
                     var getTokenPrice = await CheckContractPrice(getContract.MainLiquidityPool, getContract.ContractAddress, getContract.PairTokenAddress, getContract.Decimals, 18, network.Endpoint);
 
@@ -418,7 +420,7 @@ public async Task<bool> ExecutePayments(string receiver, TokenContract token, de
             {
                 Console.WriteLine(e);
                 logged = true;
-                MauiProgram.TxHash = "-";
+                Communication.TxHash = "-";
             }
 
             //If transaction hash has been created, start monitoring for a receipt.
@@ -429,7 +431,7 @@ public async Task<bool> ExecutePayments(string receiver, TokenContract token, de
                 {
 
                     txHash = transactionReceipt;
-                    MauiProgram.TxHash = txHash;
+                    Communication.TxHash = txHash;
                 }
             }
             return true;
@@ -451,13 +453,13 @@ public async Task<bool> ExecuteNative(string receiver, decimal amountToSend, Net
             try
             {
                 var trans = transaction.TransferEtherAsync(receiver, amountToSend, null, null, nounceVal).GetAwaiter().GetResult();
-                MauiProgram.TxHash = trans;
+                Communication.TxHash = trans;
                 return true;
 
             }
             catch (Exception e)
             {
-                MauiProgram.TxHash = "-";
+                Communication.TxHash = "-";
                 Console.WriteLine(e);
                 return false;
             }

Data/HardwareService.cs

@@ -20,7 +20,7 @@ namespace NFTLock.Data
     internal class HardwareService : IHardwareService
     { 
         IUtilities Utilities = ServiceHelper.GetService<IUtilities>();
- 
+        ICommunication Communication = ServiceHelper.GetService<ICommunication>();
 
         public string DeviceConnected()
         {
@@ -33,7 +33,7 @@ public string DeviceConnected()
             foreach (string port in portNames)
             {
                 Debug.WriteLine(port);
-                MauiProgram.ComPort = port;
+                Communication.ComPort = port;
                 current = port;
             }
 
@@ -67,7 +67,7 @@ public bool CreateNewDevice(string port)
 
 
             //Uploads the firmware to device.
-            ConfigureHardware(MauiProgram.DeviceType, @$"{Utilities.GetOsSavePath()}\wallet.ino.standard.hex", port);
+            ConfigureHardware(Communication.DeviceType, @$"{Utilities.GetOsSavePath()}\wallet.ino.standard.hex", port);
 
             Debug.WriteLine("Device Updated");
             return true;

Data/PaymentService.cs

@@ -23,28 +23,30 @@ internal class PaymentService : IPaymentService
         IContractService ContractService { get; set; }
         IUtilities Utilities { get; set; }
         IAuthenicationService AuthenicationService { get; set; }
+        ICommunication Communication { get; set; }
 
         //Init the constructor and inherit all dependencies.
         public PaymentService()
         {
             ContractService = ServiceHelper.GetService<IContractService>();
             Utilities = ServiceHelper.GetService<IUtilities>();
             AuthenicationService = ServiceHelper.GetService<IAuthenicationService>();
+            Communication = ServiceHelper.GetService<ICommunication>();
         }
 
         public async Task<TransactionResult> BeginTransaction()
         {
-            var wallet = AuthenicationService.UnlockWallet(MauiProgram.Pass); //One of decrypt the PK encoded on the device and open the wallet.
+            var wallet = AuthenicationService.UnlockWallet(Communication.Pass); //One of decrypt the PK encoded on the device and open the wallet.
 
             //If wallet doesn't exist return null
             if(wallet == null)
                 return null; 
 
             //Check if a contract exists (Native currencies don't have a contract) if false, send native chain token.
-            if (string.IsNullOrEmpty(MauiProgram.SelectedContract.ContractAddress))
-                await ContractService.ExecuteNative(MauiProgram.ReceiverAddress, MauiProgram.Amount, wallet, MauiProgram.ActiveNetwork.Endpoint, MauiProgram.ActiveNetwork.Chainid);
+            if (string.IsNullOrEmpty(Communication.SelectedContract.ContractAddress))
+                await ContractService.ExecuteNative(Communication.ReceiverAddress, Communication.Amount, wallet, Communication.ActiveNetwork.Endpoint, Communication.ActiveNetwork.Chainid);
             else
-                await ContractService.ExecutePayments(MauiProgram.ReceiverAddress, MauiProgram.SelectedContract, MauiProgram.Amount, wallet, MauiProgram.ActiveNetwork.Endpoint, MauiProgram.ActiveNetwork.Chainid);
+                await ContractService.ExecutePayments(Communication.ReceiverAddress, Communication.SelectedContract, Communication.Amount, wallet, Communication.ActiveNetwork.Endpoint, Communication.ActiveNetwork.Chainid);
 
             //Defer next check, it will be validated after the next block regardless.
             var dateTime = DateTime.UtcNow.AddSeconds(30); 
@@ -55,12 +57,12 @@ public async Task<TransactionResult> BeginTransaction()
                 //If time is over the check time validate if the transaction is validated
                 if(DateTime.UtcNow > dateTime)
                 {
-                    await ValidateTransaction(MauiProgram.TxHash);
+                    await ValidateTransaction(Communication.TxHash);
                     dateTime = DateTime.UtcNow.AddSeconds(30);
                 }
 
             }
-            MauiProgram.ClearCredentials();
+            Communication.ClearCredentials();
             return TransactionResult;
         }
 
@@ -69,7 +71,7 @@ public async Task<bool> ValidateTransaction(string txHash)
         {
             //We don't need a real wallet here, Pass is empty however due to how Nethereum operates we need to make the request from the object, so we can inherit the chain
             //That's why we just instance a object to interact with the chain.
-            var account = AuthenicationService.UnlockWallet(MauiProgram.Pass);
+            var account = AuthenicationService.UnlockWallet(Communication.Pass);
 
             //If Hash is empty return false. Return an empty object to avoid recursion in the loop.
             if (string.IsNullOrEmpty(txHash))
@@ -78,7 +80,7 @@ public async Task<bool> ValidateTransaction(string txHash)
                 {
                     TransactionHash = "-1"
                 };
-                MauiProgram.TxHash = string.Empty;
+                Communication.TxHash = string.Empty;
                 return false;
             }    
 
@@ -93,13 +95,13 @@ public async Task<bool> ValidateTransaction(string txHash)
                     Timestamp = DateTime.UtcNow,
                     TransactionHash = "Transaction failed, internal error, insuficient balance or gas!"
                 };
-                MauiProgram.TxHash = string.Empty;
+                Communication.TxHash = string.Empty;
                 return false;
             }
 
             //Create a new web3 instance, using the account object, for the chain data and the current selected network. 
             //We send a request to the blockchain to check the receipt of the transaction.
-            var web3 = new Web3(account, MauiProgram.ActiveNetwork.Endpoint);
+            var web3 = new Web3(account, Communication.ActiveNetwork.Endpoint);
             var transactionReceipt = await web3.Eth.Transactions.GetTransactionReceipt.SendRequestAsync(txHash);
             if (transactionReceipt == null) //Check if transaction is processed in case it fails sent it to quoue;
             {
@@ -122,7 +124,7 @@ public async Task<bool> ValidateTransaction(string txHash)
                         Timestamp = DateTime.UtcNow,
                         TransactionHash = transactionReceipt.TransactionHash
                     };
-                    MauiProgram.TxHash = string.Empty;
+                    Communication.TxHash = string.Empty;
                     return true;
                 }
                 else if (transactionReceipt.Failed())
@@ -135,7 +137,7 @@ public async Task<bool> ValidateTransaction(string txHash)
                         Timestamp = DateTime.UtcNow,
                         TransactionHash = "Transaction failed, internal error, insuficient balance or gas!"
                     };
-                    MauiProgram.TxHash = string.Empty;
+                    Communication.TxHash = string.Empty;
                     return false;
                 }
             }
@@ -144,12 +146,11 @@ public async Task<bool> ValidateTransaction(string txHash)
             var transferEvent = transferEventOutput.FirstOrDefault().Event;
 
             //We get the ETH contract actual tokens by substracting the decimals that are obsolete
-            var actualTransfer = Utilities.ConvertToDex((decimal)transferEvent.Value, MauiProgram.SelectedContract.Decimals);
-            if (transferEvent.From.ToUpper() != MauiProgram.PublicAddress.ToUpper() || actualTransfer < 0)
+            var actualTransfer = Utilities.ConvertToDex((decimal)transferEvent.Value, Communication.SelectedContract.Decimals);
+            if (transferEvent.From.ToUpper() != Communication.PublicAddress.ToUpper() || actualTransfer < 0)
                 return false;
 
-            MauiProgram.TxHash = string.Empty;
-
+ 
             TransactionResult = new TransactionResult
             {
                 Amount = actualTransfer,
@@ -158,7 +159,7 @@ public async Task<bool> ValidateTransaction(string txHash)
                 Timestamp = DateTime.UtcNow,
                 TransactionHash = transactionReceipt.TransactionHash
             };
-            MauiProgram.TxHash = string.Empty;
+            Communication.TxHash = string.Empty;
 
             return true;
         }