IExternalProcessHelper created to abstract the static call Process.Start

neo-gui/App.config

@@ -1,32 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="Neo.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Neo.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
   </startup>
   <userSettings>
     <Neo.Properties.Settings>
       <setting name="NeedUpgrade" serializeAs="String">
         <value>True</value>
       </setting>
       <setting name="LastWalletPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="InstallCertificate" serializeAs="String">
         <value>True</value>
       </setting>
       <setting name="NEP5Watched" serializeAs="Xml">
         <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
         </value>
       </setting>
       <setting name="AppTheme" serializeAs="String">
-        <value />
+        <value/>
       </setting>
     </Neo.Properties.Settings>
   </userSettings>

neo-gui/App.xaml.cs

@@ -21,7 +21,10 @@ internal App(bool updateIsRequired = false)
 
             BuildContainer();
 
-            this.MainWindow = updateIsRequired ? (Window) new UpdateView() : new HomeView();
+            var blockChainController = ApplicationContext.Instance.ContainerLifetimeScope.Resolve(typeof(IBlockChainController)) as IBlockChainController;
+            blockChainController.StartLocalNode();
+
+            this.MainWindow = updateIsRequired ? (Window)new UpdateView() : new HomeView();
         }
 
         protected override void OnStartup(StartupEventArgs e)
@@ -37,6 +40,7 @@ private static void BuildContainer()
         {
             var autoFacContainerBuilder = new ContainerBuilder();
 
+            autoFacContainerBuilder.RegisterModule<NeoGuiRegistrationModule>();
             autoFacContainerBuilder.RegisterModule<ViewModelsRegistrationModule>();
             autoFacContainerBuilder.RegisterModule<BaseRegistrationModule>();
             autoFacContainerBuilder.RegisterModule<ControllersRegistrationModule>();

neo-gui/ApplicationContext.cs

@@ -10,13 +10,7 @@ public class ApplicationContext : IApplicationContext
         #region Singleton Pattern
         private static readonly Lazy<ApplicationContext> lazyInstance = new Lazy<ApplicationContext>(() => new ApplicationContext());
 
-        // Prevent other classes from calling constructor
-        private ApplicationContext()
-        {
-        }
-
         public static ApplicationContext Instance => lazyInstance.Value;
-
         #endregion
 
         public ILifetimeScope ContainerLifetimeScope { get; set; }

neo-gui/Controllers/AccountItemExtensionMethods.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Linq;
+using Neo.UI;
+
+namespace Neo.Controllers
+{
+    public static class AccountItemExtensionMethods
+    {
+        public static AccountItem GetAccountItemForAddress(this IEnumerable<AccountItem> accountItems, string address)
+        {
+            return accountItems.FirstOrDefault(x => x.Address.Equals(address));
+        }
+    }
+}

neo-gui/Controllers/BlockChainController.cs

@@ -9,6 +9,7 @@
 using Neo.Implementations.Blockchains.LevelDB;
 using Neo.Implementations.Wallets.EntityFramework;
 using Neo.IO;
+using Neo.Network;
 using Neo.Properties;
 using Neo.SmartContract;
 using Neo.UI;
@@ -22,11 +23,13 @@ namespace Neo.Controllers
     public class BlockChainController : IBlockChainController
     {
         #region Private Fields
-        private readonly object uiUpdateTimerLock = new object();
+        private readonly IWalletController walletController;
         private readonly IApplicationContext applicationContext;
         private readonly IMessagePublisher messagePublisher;
         private readonly IDispatcher dispatcher;
 
+        private LocalNode localNode;
+
         private DateTime persistenceTime = DateTime.MinValue;
         private Timer uiUpdateTimer;
         private bool balanceChanged;
@@ -35,51 +38,52 @@ public class BlockChainController : IBlockChainController
 
         #region Constructor 
         public BlockChainController(
+            IWalletController walletController,
             IApplicationContext applicationContext, 
             IMessagePublisher messagePublisher, 
             IDispatcher dispatcher)
         {
+            this.walletController = walletController;
             this.applicationContext = applicationContext;
             this.messagePublisher = messagePublisher;
             this.dispatcher = dispatcher;
+        }
+        #endregion
+
+        #region IBlockChainController implementation 
+        public void StartLocalNode()
+        {
+            this.localNode = new LocalNode
+            {
+                UpnpEnabled = true
+            };
+            this.applicationContext.LocalNode = this.localNode;
 
             Task.Run(() =>
             {
                 CheckForNewerVersion();
 
                 ImportBlocksIfRequired();
 
-                Blockchain.PersistCompleted += Blockchain_PersistCompleted;
+                Blockchain.PersistCompleted += this.BlockchainPersistCompleted;
 
                 // Start node
-                this.applicationContext.LocalNode.Start(Settings.Default.NodePort, Settings.Default.WsPort);
+                this.localNode.Start(Settings.Default.NodePort, Settings.Default.WsPort);
             });
 
-            lock (this.uiUpdateTimerLock)
+            this.uiUpdateTimer = new Timer
             {
-                if (this.uiUpdateTimer != null)
-                {
-                    // Stop previous timer
-                    this.uiUpdateTimer.Stop();
-
-                    this.uiUpdateTimer.Elapsed -= this.UpdateWallet;
-
-                    this.uiUpdateTimer.Dispose();
-
-                    this.uiUpdateTimer = null;
-                }
+                Interval = 500,
+                Enabled = true,
+                AutoReset = true
+            };
 
-                var timer = new Timer
-                {
-                    Interval = 500,
-                    Enabled = true,
-                    AutoReset = true
-                };
-
-                timer.Elapsed += this.UpdateWallet;
+            this.uiUpdateTimer.Elapsed += this.UpdateWallet;
+        }
 
-                this.uiUpdateTimer = timer;
-            }
+        public void Relay(Transaction transaction)
+        {
+            this.localNode.Relay(transaction);
         }
         #endregion
 
@@ -89,7 +93,6 @@ private void UpdateWallet(object sender, ElapsedEventArgs e)
             var persistenceSpan = DateTime.UtcNow - this.persistenceTime;
 
             this.UpdateBlockProgress(persistenceSpan);
-
             this.UpdateBalances(persistenceSpan);
         }
 
@@ -98,7 +101,10 @@ private void UpdateBlockProgress(TimeSpan persistenceSpan)
             var blockProgressIndeterminate = false;
             var blockProgress = 0;
 
-            if (persistenceSpan < TimeSpan.Zero) persistenceSpan = TimeSpan.Zero;
+            if (persistenceSpan < TimeSpan.Zero)
+            {
+                persistenceSpan = TimeSpan.Zero;
+            }
 
             if (persistenceSpan > Blockchain.TimePerBlock)
             {
@@ -111,7 +117,7 @@ private void UpdateBlockProgress(TimeSpan persistenceSpan)
             }
 
             var blockHeight = $"{GetWalletHeight()}/{Blockchain.Default.Height}/{Blockchain.Default.HeaderHeight}";
-            var nodeCount = this.applicationContext.LocalNode.RemoteNodeCount;
+            var nodeCount = this.localNode.RemoteNodeCount;
             var blockStatus = $"{Strings.WaitingForNextBlock}:";
 
             var blockProgressMessage = new BlockProgressMessage(
@@ -125,7 +131,7 @@ private void UpdateBlockProgress(TimeSpan persistenceSpan)
 
         private void UpdateBalances(TimeSpan persistenceSpan)
         {
-            if (ApplicationContext.Instance.CurrentWallet == null) return;
+            if (!this.walletController.IsWalletOpen) return;
 
             this.UpdateAssetBalances();
 
@@ -134,9 +140,9 @@ private void UpdateBalances(TimeSpan persistenceSpan)
 
         private void UpdateAssetBalances()
         {
-            if (ApplicationContext.Instance.CurrentWallet.WalletHeight > Blockchain.Default.Height + 1) return;
+            if (this.walletController.WalletWeight > Blockchain.Default.Height + 1) return;
 
-            this.messagePublisher.Publish(new UpdateAcountListMessage());
+            this.messagePublisher.Publish(new AccountBalancesChangedMessage());
             this.messagePublisher.Publish(new UpdateAssetsBalanceMessage(this.balanceChanged));
         }
 
@@ -147,7 +153,8 @@ private async void UpdateNEP5TokenBalances(TimeSpan persistenceSpan)
             if (persistenceSpan <= TimeSpan.FromSeconds(2)) return;
 
             // Update balances
-            var addresses = ApplicationContext.Instance.CurrentWallet.GetAddresses().ToArray();
+            var addresses = this.walletController.GetAddresses();
+
             foreach (var s in Settings.Default.NEP5Watched)
             {
                 var scriptHash = UInt160.Parse(s);
@@ -203,11 +210,11 @@ private uint GetWalletHeight()
         {
             uint walletHeight = 0;
 
-            if (this.applicationContext.CurrentWallet != null &&
-                this.applicationContext.CurrentWallet.WalletHeight > 0)
+            if (this.walletController.IsWalletOpen &&
+                this.walletController.WalletWeight > 0)
             {
                 // Set wallet height
-                walletHeight = this.applicationContext.CurrentWallet.WalletHeight - 1;
+                walletHeight = this.walletController.WalletWeight - 1;
             }
 
             return walletHeight;
@@ -270,15 +277,17 @@ private void ImportBlocks(Stream stream)
             blockchain.VerifyBlocks = true;
         }
 
-        private void Blockchain_PersistCompleted(object sender, Block block)
+        private void BlockchainPersistCompleted(object sender, Block block)
         {
             this.persistenceTime = DateTime.UtcNow;
-            if (ApplicationContext.Instance.CurrentWallet != null)
+            if (this.walletController.IsWalletOpen)
             {
                 this.checkNep5Balance = true;
 
-                var coins = ApplicationContext.Instance.CurrentWallet.GetCoins();
-                if (coins.Any(coin => !coin.State.HasFlag(CoinState.Spent) &&
+                var coins = this.walletController.GetCoins();
+
+                if (coins.Any(
+                    coin => !coin.State.HasFlag(CoinState.Spent) &&
                     coin.Output.AssetId.Equals(Blockchain.GoverningToken.Hash)))
                 {
                     balanceChanged = true;

neo-gui/Controllers/ControllersRegistrationModule.cs

@@ -11,6 +11,11 @@ protected override void Load(ContainerBuilder builder)
                 .As<IBlockChainController>()
                 .SingleInstance();
 
+            builder
+                .RegisterType<WalletController>()
+                .As<IWalletController>()
+                .SingleInstance();
+
             base.Load(builder);
         }
     }

neo-gui/Controllers/IBlockChainController.cs

@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Neo.Core;
 
 namespace Neo.Controllers
 {
     public interface IBlockChainController
     {
+        void StartLocalNode();
+
+        void Relay(Transaction transaction);
     }
 }

neo-gui/Controllers/IWalletController.cs

@@ -1,9 +1,40 @@
-namespace Neo.Controllers
+using System.Collections.Generic;
+using Neo.Core;
+using Neo.SmartContract;
+using Neo.Wallets;
+
+namespace Neo.Controllers
 {
     public interface IWalletController
     {
+        bool IsWalletOpen { get; }
+
+        uint WalletWeight { get; }
+
         void CreateWallet(string walletPath, string password);
 
-        void OpenWallet(string walletPath, string password);
+        void OpenWallet(string walletPath, string password, bool repairMode);
+
+        void CloseWallet();
+
+        void RebuildWalletIndexes();
+
+        void SaveTransaction(Transaction transaction);
+
+        void Sign(ContractParametersContext context);
+
+        void CreateNewKey();        // TODO - Issue #43 [AboimPinto] - this method will create a new key or new NEO address? Please review the name.
+
+        IEnumerable<UInt160> GetAddresses();
+
+        IEnumerable<Coin> GetCoins();
+
+        VerificationContract GetContract(UInt160 scriptHash);
+
+        void ImportWatchOnlyAddress(string addressToImport);
+
+        KeyPair GetKeyByScriptHash(UInt160 scriptHash);
+
+        void DeleteAddress(UInt160 scriptHash);
     }
 }