Allow smart contract verification

neo-cli/CLI/Helper.cs

@@ -2,15 +2,6 @@ namespace Neo.CLI
 {
     internal static class Helper
     {
-        public static bool ToBool(this string input)
-        {
-            if (input == null) return false;
-
-            input = input.ToLowerInvariant();
-
-            return input == "true" || input == "yes" || input == "1";
-        }
-
         public static bool IsYes(this string input)
         {
             if (input == null) return false;

neo-cli/CLI/MainService.Contracts.cs

@@ -1,13 +1,8 @@
 using Neo.ConsoleService;
 using Neo.IO.Json;
-using Neo.Ledger;
 using Neo.Network.P2P.Payloads;
-using Neo.Persistence;
-using Neo.SmartContract;
 using Neo.SmartContract.Native;
-using Neo.VM;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace Neo.CLI
@@ -53,7 +48,7 @@ private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray contra
         {
             Signer[] signers = Array.Empty<Signer>();
             if (signerAccounts != null && !NoWallet())
-                signers = CurrentWallet.GetAccounts().Where(p => !p.Lock && !p.WatchOnly && signerAccounts.Contains(p.ScriptHash)).Select(p => new Signer() { Account = p.ScriptHash, Scopes = WitnessScope.CalledByEntry }).ToArray();
+                signers = CurrentWallet.GetAccounts().Where(p => !p.Lock && signerAccounts.Contains(p.ScriptHash)).Select(p => new Signer() { Account = p.ScriptHash, Scopes = WitnessScope.CalledByEntry }).ToArray();
 
             Transaction tx = new Transaction
             {

neo-cli/CLI/MainService.Wallet.cs

@@ -284,6 +284,57 @@ private void OnImportKeyCommand(string wifOrFile)
                 wallet.Save();
         }
 
+        /// <summary>
+        /// Process "import watchonly" command
+        /// </summary>
+        [ConsoleCommand("import watchonly", Category = "Wallet Commands")]
+        private void OnImportWatchOnlyCommand(string addressOrFile)
+        {
+            UInt160 address = null;
+            try
+            {
+                address = StringToAddress(addressOrFile);
+            }
+            catch (FormatException) { }
+            if (address == null)
+            {
+                var fileInfo = new FileInfo(addressOrFile);
+
+                if (!fileInfo.Exists)
+                {
+                    Console.WriteLine($"Error: File '{fileInfo.FullName}' doesn't exists");
+                    return;
+                }
+
+                if (fileInfo.Length > 1024 * 1024)
+                {
+                    if (!ReadUserInput($"The file '{fileInfo.FullName}' is too big, do you want to continue? (yes|no)", false).IsYes())
+                    {
+                        return;
+                    }
+                }
+
+                string[] lines = File.ReadAllLines(fileInfo.FullName).Where(u => !string.IsNullOrEmpty(u)).ToArray();
+                using (var percent = new ConsolePercent(0, lines.Length))
+                {
+                    for (int i = 0; i < lines.Length; i++)
+                    {
+                        address = StringToAddress(lines[i]);
+                        CurrentWallet.CreateAccount(address);
+                        percent.Value++;
+                    }
+                }
+            }
+            else
+            {
+                WalletAccount account = CurrentWallet.CreateAccount(address);
+                Console.WriteLine($"Address: {account.Address}");
+                Console.WriteLine($" Pubkey: {account.GetKey().PublicKey.EncodePoint(true).ToHexString()}");
+            }
+            if (CurrentWallet is NEP6Wallet wallet)
+                wallet.Save();
+        }
+
         /// <summary>
         /// Process "list address" command
         /// </summary>
@@ -294,8 +345,15 @@ private void OnListAddressCommand()
 
             using (var snapshot = Blockchain.Singleton.GetSnapshot())
             {
-                foreach (Contract contract in CurrentWallet.GetAccounts().Where(p => !p.WatchOnly).Select(p => p.Contract))
+                foreach (var account in CurrentWallet.GetAccounts())
                 {
+                    if (account.WatchOnly)
+                    {
+                        Console.WriteLine($"{"   Address: "}{account.Address}\tWatchOnly");
+                        continue;
+                    }
+
+                    var contract = account.Contract;
                     var type = "Nonstandard";
 
                     if (contract.Script.IsMultiSigContract())

neo-cli/CLI/MainService.cs

@@ -91,30 +91,7 @@ public MainService() : base()
 
             RegisterCommandHander<string, UInt256>(false, (str) => UInt256.Parse(str));
             RegisterCommandHander<string[], UInt256[]>((str) => str.Select(u => UInt256.Parse(u.Trim())).ToArray());
-            RegisterCommandHander<string[], UInt160[]>((arr) =>
-            {
-                return arr.Select(str =>
-                {
-                    switch (str.ToLowerInvariant())
-                    {
-                        case "neo": return NativeContract.NEO.Hash;
-                        case "gas": return NativeContract.GAS.Hash;
-                    }
-
-                    // Try to parse as UInt160
-
-                    if (UInt160.TryParse(str, out var addr))
-                    {
-                        return addr;
-                    }
-
-                    // Accept wallet format
-
-                    return str.ToScriptHash();
-                })
-                .ToArray();
-            });
-
+            RegisterCommandHander<string[], UInt160[]>((arr) => arr.Select(str => StringToAddress(str)).ToArray());
             RegisterCommandHander<string, ECPoint>((str) => ECPoint.Parse(str.Trim(), ECCurve.Secp256r1));
             RegisterCommandHander<string[], ECPoint[]>((str) => str.Select(u => ECPoint.Parse(u.Trim(), ECCurve.Secp256r1)).ToArray());
             RegisterCommandHander<string, JObject>((str) => JObject.Parse(str));
@@ -124,6 +101,26 @@ public MainService() : base()
             RegisterCommand(this);
         }
 
+        internal static UInt160 StringToAddress(string input)
+        {
+            switch (input.ToLowerInvariant())
+            {
+                case "neo": return NativeContract.NEO.Hash;
+                case "gas": return NativeContract.GAS.Hash;
+            }
+
+            // Try to parse as UInt160
+
+            if (UInt160.TryParse(input, out var addr))
+            {
+                return addr;
+            }
+
+            // Accept wallet format
+
+            return input.ToScriptHash();
+        }
+
         public override void RunConsole()
         {
             Console.ForegroundColor = ConsoleColor.DarkGreen;