Add test mode gas when invoking

Neo.ConsoleService/ConsoleServiceBase.cs

@@ -423,7 +423,6 @@ protected ConsoleServiceBase()
             RegisterCommandHander<string, bool>(false, (str) => str == "1" || str == "yes" || str == "y" || bool.Parse(str));
             RegisterCommandHander<string, ushort>(false, (str) => ushort.Parse(str));
             RegisterCommandHander<string, uint>(false, (str) => uint.Parse(str));
-            RegisterCommandHander<string, long>(false, (str) => long.Parse(str));
             RegisterCommandHander<string, IPAddress>(false, (str) => IPAddress.Parse(str));
         }
 

neo-cli/CLI/MainService.Contracts.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Numerics;
+using Neo.Wallets;
 
 namespace Neo.CLI
 {
@@ -50,8 +51,19 @@ private void OnDeployCommand(string filePath, string manifestPath = null)
         /// <param name="signerAccounts">Signer's accounts</param>
         /// <param name="gas">Max fee for running the script</param>
         [ConsoleCommand("invoke", Category = "Contract Commands")]
-        private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contractParameters = null, UInt160 sender = null, UInt160[] signerAccounts = null, long gas = TestModeGas)
+        private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contractParameters = null, UInt160 sender = null, UInt160[] signerAccounts = null, string gas = null)
         {
+            long gasAmount = TestModeGas;
+            if (!string.IsNullOrEmpty(gas))
+            {
+                AssetDescriptor descriptor = new AssetDescriptor(NativeContract.GAS.Hash);
+                if (!BigDecimal.TryParse(gas, descriptor.Decimals, out BigDecimal decimalAmount) || decimalAmount.Sign <= 0)
+                {
+                    Console.WriteLine("Incorrect Amount Format");
+                    return;
+                }
+                gasAmount = (long)decimalAmount.Value;
+            }
             Signer[] signers = Array.Empty<Signer>();
             if (signerAccounts != null && !NoWallet())
             {
@@ -78,12 +90,12 @@ private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contra
                 Witnesses = Array.Empty<Witness>(),
             };
 
-            if (!OnInvokeWithResult(scriptHash, operation, out _, tx, contractParameters, gas: gas)) return;
+            if (!OnInvokeWithResult(scriptHash, operation, out _, tx, contractParameters, gas: gasAmount)) return;
 
             if (NoWallet()) return;
             try
             {
-                tx = CurrentWallet.MakeTransaction(tx.Script, sender, signers);
+                tx = CurrentWallet.MakeTransaction(tx.Script, sender, signers, gas: gasAmount);
             }
             catch (InvalidOperationException e)
             {

neo-cli/CLI/MainService.Vote.cs

@@ -10,13 +10,27 @@ namespace Neo.CLI
 {
     partial class MainService
     {
+        public const long RegisterGas = 1010_00000000;
         /// <summary>
         /// Process "register candidate" command
         /// </summary>
-        /// <param name="account">register account scriptHash</param>        
+        /// <param name="account">register account scriptHash</param>
+        /// <param name="gas">Max fee for running the script</param>
         [ConsoleCommand("register candidate", Category = "Vote Commands")]
-        private void OnRegisterCandidateCommand(UInt160 account)
+        private void OnRegisterCandidateCommand(UInt160 account, string gas = null)
         {
+            long gasAmount = RegisterGas;
+            if (!string.IsNullOrEmpty(gas))
+            {
+                AssetDescriptor descriptor = new AssetDescriptor(NativeContract.GAS.Hash);
+                if (!BigDecimal.TryParse(gas, descriptor.Decimals, out BigDecimal decimalAmount) || decimalAmount.Sign <= 0)
+                {
+                    Console.WriteLine("Incorrect Amount Format");
+                    return;
+                }
+                gasAmount = (long)decimalAmount.Value;
+            }
+
             if (NoWallet())
             {
                 Console.WriteLine("Need open wallet!");
@@ -47,7 +61,7 @@ private void OnRegisterCandidateCommand(UInt160 account)
                 script = scriptBuilder.ToArray();
             }
 
-            SendTransaction(script, account);
+            SendTransaction(script, account, gasAmount);
         }
 
         /// <summary>

neo-cli/CLI/MainService.cs

@@ -465,8 +465,10 @@ private static void WriteLineWithoutFlicker(string message = "", int maxWidth =
         /// </summary>
         /// <param name="script">script</param>
         /// <param name="account">sender</param>
-        private void SendTransaction(byte[] script, UInt160 account = null)
+        /// <param name="gas">Max fee for running the script</param>
+        private void SendTransaction(byte[] script, UInt160 account = null, long gas = TestModeGas)
         {
+
             Signer[] signers = System.Array.Empty<Signer>();
 
             if (account != null)
@@ -482,11 +484,11 @@ private void SendTransaction(byte[] script, UInt160 account = null)
 
             try
             {
-                Transaction tx = CurrentWallet.MakeTransaction(script, account, signers);
+                Transaction tx = CurrentWallet.MakeTransaction(script, account, signers, gas: gas);
                 Console.WriteLine($"Invoking script with: '{tx.Script.ToBase64String()}'");
 
-                using (ApplicationEngine engine = ApplicationEngine.Run(tx.Script, container: tx))
-                {
+                using (ApplicationEngine engine = ApplicationEngine.Run(tx.Script, container: tx, gas: gas))
+                { 
                     PrintExecutionOutput(engine, true);
                     if (engine.State == VMState.FAULT) return;
                 }