Oracle: Improve user experience

neo-cli/CLI/MainService.Contracts.cs

@@ -48,13 +48,12 @@ private void OnDeployCommand(string filePath, string manifestPath = null)
         /// </summary>
         /// <param name="scriptHash">Script hash</param>
         /// <param name="operation">Operation</param>
-        /// <param name="contractParameters">Contract parameters</param>
+        /// <param name="parameters">Contract parameters</param>
         /// <param name="witnessAddress">Witness address</param>
         /// <param name="oracle">Oracle</param>
         [ConsoleCommand("invoke", Category = "Contract Commands")]
-        private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contractParameters = null, UInt160[] witnessAddress = null, OracleWalletBehaviour oracle = OracleWalletBehaviour.OracleWithAssert)
+        private void OnInvokeCommand(UInt160 scriptHash, string operation, ContractParameter[] parameters = null, UInt160[] witnessAddress = null, OracleWalletBehaviour oracle = OracleWalletBehaviour.OracleWithAssert)
         {
-            List<ContractParameter> parameters = new List<ContractParameter>();
             List<Cosigner> signCollection = new List<Cosigner>();
 
             if (!NoWallet() && witnessAddress != null)
@@ -80,20 +79,12 @@ private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contra
                 }
             }
 
-            if (contractParameters != null)
-            {
-                foreach (var contractParameter in contractParameters)
-                {
-                    parameters.Add(ContractParameter.FromJson(contractParameter));
-                }
-            }
-
             byte[] script;
             Transaction tx;
 
             using ScriptBuilder scriptBuilder = new ScriptBuilder();
             {
-                scriptBuilder.EmitAppCall(scriptHash, operation, parameters.ToArray());
+                scriptBuilder.EmitAppCall(scriptHash, operation, parameters ?? Array.Empty<ContractParameter>());
                 script = scriptBuilder.ToArray();
                 Console.WriteLine($"Invoking script with: '{script.ToHexString()}'");
             }

neo-cli/CLI/MainService.Oracle.cs

@@ -16,6 +16,8 @@ private void OnStartOracleCommand(byte numberOfTasks = 4)
             ShowPrompt = false;
             NeoSystem.StartOracle(CurrentWallet, numberOfTasks);
 
+            // TODO: Remove this before merge to master
+
             ApplicationEngine.Log += ApplicationEngine_Log;
         }
 

neo-cli/CLI/MainService.cs

@@ -115,10 +115,37 @@ public MainService() : base()
             RegisterCommandHander<string[], ECPoint[]>((str) => str.Select(u => ECPoint.Parse(u.Trim(), ECCurve.Secp256r1)).ToArray());
             RegisterCommandHander<string, JObject>((str) => JObject.Parse(str));
             RegisterCommandHander<JObject, JArray>((obj) => (JArray)obj);
-
+            RegisterCommandHander<JArray, ContractParameter[]>((arr) => arr.Select(u => ContractParameterFromJson(u)).ToArray());
             RegisterCommand(this);
         }
 
+        private ContractParameter ContractParameterFromJson(JObject json)
+        {
+            // As string
+
+            if (json is JString)
+            {
+                // Is not an array
+                return new ContractParameter
+                {
+                    Type = ContractParameterType.String,
+                    Value = json.AsString()
+                };
+            }
+            else if (json is JBoolean)
+            {
+                return new ContractParameter
+                {
+                    Type = ContractParameterType.Boolean,
+                    Value = json.AsBoolean()
+                };
+            }
+
+            // As array format
+
+            return ContractParameter.FromJson(json);
+        }
+
         public override void RunConsole()
         {
             Console.ForegroundColor = ConsoleColor.DarkGreen;