Gas price and raw transaction

skibitsky · skibitsky · commit 381695178a21 · 2024-09-10T11:25:01.000+03:00
diff --git a/Packages/com.walletconnect.web3modal/Runtime/Evm/EvmService.cs b/Packages/com.walletconnect.web3modal/Runtime/Evm/EvmService.cs
@@ -111,6 +111,17 @@ public Task<string> SendTransactionAsync(string addressTo, BigInteger value, str
         }
         
         
+        // -- Send Raw Transaction ------------------------------------
+        
+        public Task<string> SendRawTransactionAsync(string signedTransaction)
+        {
+            if (string.IsNullOrWhiteSpace(signedTransaction))
+                throw new ArgumentNullException(nameof(signedTransaction));
+            
+            return SendRawTransactionAsyncCore(signedTransaction);
+        }
+        
+        
         // -- Estimate Gas --------------------------------------------
         
         public Task<BigInteger> EstimateGasAsync(string addressTo, BigInteger value, string data = null)
@@ -133,6 +144,14 @@ public Task<BigInteger> EstimateGasAsync(string contractAddress, string contract
             return EstimateGasAsyncCore(contractAddress, contractAbi, methodName, value, arguments);
         }
         
+        
+        // -- Gas Price ------------------------------------------------
+        
+        public Task<BigInteger> GetGasPriceAsync()
+        {
+            return GetGasPriceAsyncCore();
+        }
+        
         protected abstract Task InitializeAsyncCore();
         protected abstract Task<BigInteger> GetBalanceAsyncCore(string address);
         protected abstract Task<string> SignMessageAsyncCore(string message);
@@ -142,7 +161,9 @@ public Task<BigInteger> EstimateGasAsync(string contractAddress, string contract
         protected abstract Task<TReturn> ReadContractAsyncCore<TReturn>(string contractAddress, string contractAbi, string methodName, object[] arguments = null);
         protected abstract Task<string> WriteContractAsyncCore(string contractAddress, string contractAbi, string methodName, BigInteger value = default, BigInteger gas = default, params object[] arguments);
         protected abstract Task<string> SendTransactionAsyncCore(string addressTo, BigInteger value, string data = null);
+        protected abstract Task<string> SendRawTransactionAsyncCore(string signedTransaction);
         protected abstract Task<BigInteger> EstimateGasAsyncCore(string addressTo, BigInteger value, string data = null);
         protected abstract Task<BigInteger> EstimateGasAsyncCore(string contractAddress, string contractAbi, string methodName, BigInteger value = default, params object[] arguments);
+        protected abstract Task<BigInteger> GetGasPriceAsyncCore();
     }
 }
diff --git a/Packages/com.walletconnect.web3modal/Runtime/Evm/NethereumEvmService.cs b/Packages/com.walletconnect.web3modal/Runtime/Evm/NethereumEvmService.cs
@@ -141,6 +141,14 @@ protected override Task<string> SendTransactionAsyncCore(string addressTo, BigIn
             var transactionInput = new TransactionInput(data, addressTo, new HexBigInteger(value));
             return Web3.Client.SendRequestAsync<string>("eth_sendTransaction", null, transactionInput);
         }
+        
+        
+        // -- Send Raw Transaction ------------------------------------
+
+        protected override Task<string> SendRawTransactionAsyncCore(string signedTransaction)
+        {
+            return Web3.Eth.Transactions.SendRawTransaction.SendRequestAsync(signedTransaction);
+        }
 
 
         // -- Estimate Gas ---------------------------------------------
@@ -159,5 +167,14 @@ protected override async Task<BigInteger> EstimateGasAsyncCore(string contractAd
             var transactionInput = new TransactionInput(function.GetData(arguments), contractAddress, new HexBigInteger(value));
             return await Web3.Eth.Transactions.EstimateGas.SendRequestAsync(transactionInput);
         }
+        
+        
+        // -- Get Gas Price -------------------------------------------
+
+        protected override async Task<BigInteger> GetGasPriceAsyncCore()
+        {
+            var hexBigInt = await Web3.Eth.GasPrice.SendRequestAsync();
+            return hexBigInt.Value;
+        }
     }
 }
diff --git a/Packages/com.walletconnect.web3modal/Runtime/Evm/WagmiEvmService.cs b/Packages/com.walletconnect.web3modal/Runtime/Evm/WagmiEvmService.cs
@@ -57,6 +57,11 @@ protected override Task<string> SendTransactionAsyncCore(string addressTo, BigIn
             return WagmiInterop.SendTransactionAsync(addressTo, value.ToString(), data);
         }
 
+        protected override Task<string> SendRawTransactionAsyncCore(string signedTransaction)
+        {
+            throw new System.NotImplementedException();
+        }
+
         protected override async Task<BigInteger> EstimateGasAsyncCore(string addressTo, BigInteger value, string data = null)
         {
             var result = await  WagmiInterop.EstimateGasAsync(addressTo, value.ToString(), data);
@@ -70,12 +75,16 @@ protected override async Task<BigInteger> EstimateGasAsyncCore(string contractAd
             
             var functionBuilder = new FunctionBuilder(contractAddress, function);
             var data = functionBuilder.GetData(arguments);
-
-            Debug.Log($"Wagmi data: {data}");
-
+            
             var result = await WagmiInterop.EstimateGasAsync(contractAddress, value.ToString(), data);
             return BigInteger.Parse(result);
         }
+
+        protected override async Task<BigInteger> GetGasPriceAsyncCore()
+        {
+            var result = await WagmiInterop.GetGasPriceAsync();
+            return BigInteger.Parse(result);
+        }
     }
 #endif
 }
diff --git a/Packages/com.walletconnect.web3modal/Runtime/WebGL/Wagmi/WagmiInterop.cs b/Packages/com.walletconnect.web3modal/Runtime/WebGL/Wagmi/WagmiInterop.cs
@@ -253,6 +253,14 @@ public static Task<string> EstimateGasAsync(string to, string value = "0", strin
 
             return InteropCallAsync<EstimateGasParameter, string>(WagmiMethods.EstimateGas, parameter);
         }
+        
+        
+        // -- Get Gas Price -------------------------------------------
+        
+        public static Task<string> GetGasPriceAsync()
+        {
+            return InteropCallAsync<object, string>(WagmiMethods.GetGasPrice, null);
+        }
     }
 #endif
 }
diff --git a/Samples/AppKit Sample/Assets/Scripts/AppKitInit.cs b/Samples/AppKit Sample/Assets/Scripts/AppKitInit.cs
@@ -9,37 +9,11 @@ public class AppKitInit : MonoBehaviour
     {
         [SerializeField] private SceneReference _menuScene;
         
-        private WalletConnectUnity.Core.Chain currentChain = new WalletConnectUnity.Core.Chain(
-            chainNamespace: "eip155", 
-            chainReference: "97",
-            name: "Binance Smart Chain Testnet",
-            viemName: "bscTestnet",
-            nativeCurrency: new WalletConnectUnity.Core.Currency
-            (
-                "Binance Coin",
-                "tBNB",
-                18
-            ),
-            blockExplorer: new WalletConnectUnity.Core.BlockExplorer
-                ("BscScan", "https://testnet.bscscan.com"),
-            rpcUrl: "https://data-seed-prebsc-1-s1.bnbchain.org:8545/",
-            isTestnet: true,
-            imageUrl: "https://cryptologos.cc/logos/binance-coin-bnb-logo.png" // Example image URL for Binance Coin
-        );
-
         private async void Start()
         {
             Debug.Log($"[AppKit Init] Initializing AppKit...");
-            await Web3Modal.InitializeAsync(new Web3ModalConfig
-            {
-                supportedChains = new[]
-                {
-                    currentChain
-                }
-            });
+            await Web3Modal.InitializeAsync();
             
-            // await Web3Modal.InitializeAsync();
-
             var wc = WalletConnectConnector.WalletConnectInstance;
             if (wc is { IsInitialized: true })
             {
diff --git a/Samples/AppKit Sample/Assets/Scripts/Dapp.cs b/Samples/AppKit Sample/Assets/Scripts/Dapp.cs
@@ -82,12 +82,6 @@ private void BuildButtons()
                     }
                 },
                 new ButtonStruct
-                {
-                    Text = "Write Contract",
-                    OnClick = OnWriteContractClicked,
-                    AccountRequired = true
-                },
-                new ButtonStruct
                 {
                     Text = "Disconnect",
                     OnClick = OnDisconnectButton,
@@ -366,32 +360,6 @@ public async void OnReadContractClicked()
             }
         }
 
-        public async void OnWriteContractClicked()
-        {
-            const string contractAddress = "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984";
-            const string recipientAddress = "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045";
-            const string abi = @"[{""constant"":false,""inputs"":[{""name"":""to"",""type"":""address""},{""name"":""value"",""type"":""uint256""}],""name"":""transfer"",""outputs"":[{""name"":"""",""type"":""bool""}],""payable"":false,""stateMutability"":""nonpayable"",""type"":""function""}]";
-            
-            BigInteger amount = 1;
-
-            Debug.Log("Let's estimate gas...");
-            
-            var gas = await Web3Modal.Evm.EstimateGasAsync(contractAddress, abi, "transfer", value: default, recipientAddress, amount);
-            
-            Debug.Log($"Estimated gas: {gas}");
-            
-
-
-            // // Arguments for the transfer method. The order of the arguments must match the order in the method signature.
-            // // Method signature: `function transfer(address _to, uint256 _value) public returns (bool success)`
-            // var arguments = new object[]
-            // {
-            //     recipientAddress,
-            //     amount
-            // };
-            // var result = await Web3Modal.Evm.WriteContractAsync(contractAddress, abi, "transfer", arguments);
-        }
-
         private TypedData<Domain> GetMailTypedDefinition()
         {
             return new TypedData<Domain>
diff --git a/Samples/AppKit Sample/Packages/packages-lock.json b/Samples/AppKit Sample/Packages/packages-lock.json
@@ -164,17 +164,17 @@
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.2d.sprite": "1.0.0",
         "com.unity.ugui": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.imageconversion": "1.0.0",
+        "com.unity.2d.sprite": "1.0.0",
+        "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
         "com.unity.modules.physics2d": "1.0.0",
-        "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.uielements": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequesttexture": "1.0.0",
-        "com.unity.modules.unitywebrequestwww": "1.0.0"
+        "com.unity.modules.unitywebrequestwww": "1.0.0",
+        "com.unity.modules.unitywebrequesttexture": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ protected override Task<string> SendTransactionAsyncCore(string addressTo, BigIn`
`57`	`57`	`return WagmiInterop.SendTransactionAsync(addressTo, value.ToString(), data);`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ protected override Task<string> SendRawTransactionAsyncCore(string signedTransaction)`
	`61`	`+ {`
	`62`	`+ throw new System.NotImplementedException();`
	`63`	`+ }`
	`64`	`+`
`60`	`65`	`protected override async Task<BigInteger> EstimateGasAsyncCore(string addressTo, BigInteger value, string data = null)`
`61`	`66`	`{`
`62`	`67`	`var result = await WagmiInterop.EstimateGasAsync(addressTo, value.ToString(), data);`
`@@ -70,12 +75,16 @@ protected override async Task<BigInteger> EstimateGasAsyncCore(string contractAd`
`70`	`75`
`71`	`76`	`var functionBuilder = new FunctionBuilder(contractAddress, function);`
`72`	`77`	`var data = functionBuilder.GetData(arguments);`
`73`		`-`
`74`		`- Debug.Log($"Wagmi data: {data}");`
`75`		`-`
	`78`	`+`
`76`	`79`	`var result = await WagmiInterop.EstimateGasAsync(contractAddress, value.ToString(), data);`
`77`	`80`	`return BigInteger.Parse(result);`
`78`	`81`	`}`
	`82`	`+`
	`83`	`+ protected override async Task<BigInteger> GetGasPriceAsyncCore()`
	`84`	`+ {`
	`85`	`+ var result = await WagmiInterop.GetGasPriceAsync();`
	`86`	`+ return BigInteger.Parse(result);`
	`87`	`+ }`
`79`	`88`	`}`
`80`	`89`	`#endif`
`81`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,14 @@ public static Task<string> EstimateGasAsync(string to, string value = "0", strin`
`253`	`253`
`254`	`254`	`return InteropCallAsync<EstimateGasParameter, string>(WagmiMethods.EstimateGas, parameter);`
`255`	`255`	`}`
	`256`	`+`
	`257`	`+`
	`258`	`+ // -- Get Gas Price -------------------------------------------`
	`259`	`+`
	`260`	`+ public static Task<string> GetGasPriceAsync()`
	`261`	`+ {`
	`262`	`+ return InteropCallAsync<object, string>(WagmiMethods.GetGasPrice, null);`
	`263`	`+ }`
`256`	`264`	`}`
`257`	`265`	`#endif`
`258`	`266`	`}`