Merge pull request #7 from cometh-game/develop

Develop

Assets/ComethSDK/Examples/Scripts/ExampleScripts.asmdef

@@ -11,7 +11,9 @@
     "GUID:9180fc10182395d41bacb05e43007847",
     "GUID:20ff5bdc0066ab04a80b5c6707f10371",
     "GUID:0022c094e0c7f481288196a6d3e9ce33",
-    "GUID:7dd4f8caf82c243428d2e7006f515400"
+    "GUID:7dd4f8caf82c243428d2e7006f515400",
+    "GUID:a624b62300d14c788d1e3cedda57dc69",
+    "GUID:66ce3b4eab902fe469aa1f5b8634d609"
   ],
   "includePlatforms": [],
   "excludePlatforms": [],

Assets/ComethSDK/Examples/Scripts/TestConnectWallet.cs

@@ -1,7 +1,7 @@
 using ComethSDK.Scripts.Adapters;
 using ComethSDK.Scripts.Core;
+using ComethSDK.Scripts.Services;
 using ComethSDK.Scripts.Tools;
-using ComethSDK.Scripts.Types;
 using Nethereum.Web3;
 using TMPro;
 using UnityEngine;
@@ -28,7 +28,10 @@ private void Start()
 		public async void Connect()
 		{
 			PrintInConsole("Connecting...");
-			await _wallet.Connect(walletAddress);
+			if(string.IsNullOrEmpty(walletAddress))
+				await _wallet.Connect();
+			else
+				await _wallet.Connect(walletAddress);
 			PrintInConsole("Connected");
 		}
 
@@ -133,7 +136,7 @@ private async void EstimateGasAndShow(string to, string value, string data)
 			var web3 = new Web3(Constants.GetNetworkByChainID(authAdaptor.ChainId).RPCUrl);
 			var nonce = await Utils.GetNonce(web3, _wallet.GetAddress());
 
-			var gas = await _wallet.CalculateMaxFees(to, value, data, nonce);
+			var gas = await GasService.CalculateMaxFees(_wallet.GetAddress(), to, value, data, nonce, web3);
 			PrintInConsole("Estimated max gas: " + gas);
 		}
 
@@ -153,11 +156,5 @@ private void PrintInConsole(string str)
 		{
 			console.text += str + "\n";
 		}
-
-		private void PrintUserInfosInConsole(UserInfos userInfos)
-		{
-			PrintInConsole("walletAddress: " + userInfos.walletAddress);
-			PrintInConsole("ownerAddress: " + userInfos.ownerAddress);
-		}
 	}
 }

Assets/ComethSDK/Examples/Scripts/TestWalletConnectWithJwt.cs

@@ -1,6 +1,7 @@
 using System;
 using ComethSDK.Scripts.Adapters;
 using ComethSDK.Scripts.Core;
+using ComethSDK.Scripts.Services;
 using ComethSDK.Scripts.Tools;
 using ComethSDK.Scripts.Types;
 using Nethereum.Web3;
@@ -108,7 +109,7 @@ private async void EstimateGasAndShow(string to, string value, string data)
 		{
 			var web3 = new Web3(Constants.GetNetworkByChainID(authWithJwtAdaptor.ChainId).RPCUrl);
 			var nonce = await Utils.GetNonce(web3, _wallet.GetAddress());
-			var gas = await _wallet.CalculateMaxFees(to, value, data, nonce);
+			var gas = await GasService.CalculateMaxFees(_wallet.GetAddress(), to, value, data, nonce, web3);
 			PrintInConsole("Estimated max gas: " + gas);
 		}
 

Assets/ComethSDK/Plugins/NethereumLib/LICENSE.md

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2023 Nethereum.com (Juan Blanco) , Logo by Cass (https://github.com/c055)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or ANY portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.