Merge branch 'add-plugin-config' of https://github.com/cschuchardt88/neo

 into add-plugin-config

.gitignore

@@ -256,3 +256,4 @@ paket-files/
 
 PublishProfiles
 /.vscode
+launchSettings.json

src/Neo.CLI/CLI/MainService.Contracts.cs

@@ -133,21 +133,27 @@ private void OnInvokeCommand(UInt160 scriptHash, string operation, JArray? contr
         {
             var gas = new BigDecimal(maxGas, NativeContract.GAS.Decimals);
             Signer[] signers = Array.Empty<Signer>();
-            if (!NoWallet() && sender != null)
+            if (!NoWallet())
             {
-                if (signerAccounts == null)
-                    signerAccounts = new UInt160[1] { sender };
-                else if (signerAccounts.Contains(sender) && signerAccounts[0] != sender)
-                {
-                    var signersList = signerAccounts.ToList();
-                    signersList.Remove(sender);
-                    signerAccounts = signersList.Prepend(sender).ToArray();
-                }
-                else if (!signerAccounts.Contains(sender))
+                if (sender == null)
+                    sender = CurrentWallet!.GetDefaultAccount()?.ScriptHash;
+
+                if (sender != null)
                 {
-                    signerAccounts = signerAccounts.Prepend(sender).ToArray();
+                    if (signerAccounts == null)
+                        signerAccounts = new UInt160[1] { sender };
+                    else if (signerAccounts.Contains(sender) && signerAccounts[0] != sender)
+                    {
+                        var signersList = signerAccounts.ToList();
+                        signersList.Remove(sender);
+                        signerAccounts = signersList.Prepend(sender).ToArray();
+                    }
+                    else if (!signerAccounts.Contains(sender))
+                    {
+                        signerAccounts = signerAccounts.Prepend(sender).ToArray();
+                    }
+                    signers = signerAccounts.Select(p => new Signer() { Account = p, Scopes = WitnessScope.CalledByEntry }).ToArray();
                 }
-                signers = signerAccounts.Select(p => new Signer() { Account = p, Scopes = WitnessScope.CalledByEntry }).ToArray();
             }
 
             Transaction tx = new Transaction

src/Neo.CLI/CLI/MainService.Plugins.cs

@@ -33,7 +33,7 @@ partial class MainService
         /// </summary>
         /// <param name="pluginName">Plugin name</param>
         [ConsoleCommand("install", Category = "Plugin Commands")]
-        private void OnInstallCommandAsync(string pluginName)
+        private void OnInstallCommand(string pluginName)
         {
             if (PluginExists(pluginName))
             {