Merge pull request #147 from Ashuaidehao/master

v1.5.1

neo3-gui/neo3-gui/ClientApp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "new-gui",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "private": true,
   "main": "main.js",
   "homepage": "./",

neo3-gui/neo3-gui/ClientApp/src/neonode.js

@@ -28,7 +28,13 @@ class NeoNode {
   }
 
   start(env, errorCallback) {
-    this.node = this.runCommand("dotnet neo3-gui.dll", env, errorCallback);
+    if (isWin) {
+      this.node = this.runCommand("./neo3-gui.exe", env, errorCallback);
+
+    } else {
+      this.node = this.runCommand("./neo3-gui", env, errorCallback);
+    }
+    // this.node = this.runCommand("dotnet neo3-gui.dll", env, errorCallback);
   }
 
   startNode(network, port, errorCallback) {
@@ -40,7 +46,7 @@ class NeoNode {
    * force restart node after 1 second (using config file)
    */
   switchNode(network) {
-    console.log("switche to:", network);
+    console.log("switch to:", network);
     if (network) {
       Config.changeNetwork(network);
     }
@@ -82,7 +88,7 @@ class NeoNode {
     }
 
     const ps = spawn(command, [], {
-      shell: true,
+      shell: false,
       encoding: "utf8",
       cwd: path.join(startPath, "build-neo-node"),
       env: childEnv,

neo3-gui/neo3-gui/Common/Analyzers/BlockAnalyzer.cs

@@ -11,7 +11,6 @@
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
 using Neo.VM;
-using Array = Neo.VM.Types.Array;
 
 namespace Neo.Common.Analyzers
 {
@@ -156,20 +155,19 @@ private void ProcessTransfer(NotifyEventArgs notification, Blockchain.Applicatio
                 Result.BalanceChangeAccounts.Add(new AccountAsset(transfer.To, transfer.Asset));
             }
 
-            if (appExec.Trigger == TriggerType.Application)
+
+            var transferStorageItem = new TransferStorageItem()
             {
-                var transferStorageItem = new TransferStorageItem()
-                {
-                    From = transfer.From,
-                    To = transfer.To,
-                    Asset = transfer.Asset,
-                    Amount = transfer.Amount,
-                    TxId = appExec?.Transaction?.Hash,
-                    Trigger = appExec.Trigger,
-                    TokenId = transfer.TokenId?.ToHexString(),
-                };
-                Result.Transfers.Add(transferStorageItem);
-            }
+                From = transfer.From,
+                To = transfer.To,
+                Asset = transfer.Asset,
+                Amount = transfer.Amount,
+                TxId = appExec?.Transaction?.Hash,
+                Trigger = appExec.Trigger,
+                TokenId = transfer.TokenId?.ToHexString(),
+            };
+            Result.Transfers.Add(transferStorageItem);
+
         }
 
 

neo3-gui/neo3-gui/Common/Consoles/MainService.cs

@@ -1,20 +1,13 @@
 using Akka.Actor;
-using Microsoft.Extensions.Configuration;
 using Neo.IO;
 using Neo.Ledger;
 using Neo.Network.P2P;
-using Neo.Network.P2P.Capabilities;
 using Neo.Network.P2P.Payloads;
-using Neo.Persistence;
 using Neo.Plugins;
-using Neo.Services;
 using Neo.SmartContract;
-using Neo.SmartContract.Manifest;
 using Neo.SmartContract.Native;
-using Neo.VM;
 using Neo.Wallets;
 using Neo.Wallets.NEP6;
-using Neo.Wallets.SQLite;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -23,7 +16,6 @@
 using System.Net;
 using System.Numerics;
 using System.Security.Cryptography;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -708,15 +700,9 @@ public void OpenWallet(string path, string password)
                 throw new FileNotFoundException();
             }
 
-            if (Path.GetExtension(path) == ".db3")
-            {
-                CurrentWallet = UserWallet.Open(path, password, CliSettings.Default.Protocol);
-            }
-            else
-            {
-                NEP6Wallet nep6wallet = new NEP6Wallet(path, password, CliSettings.Default.Protocol);
-                CurrentWallet = nep6wallet;
-            }
+            NEP6Wallet nep6wallet = new NEP6Wallet(path, password, CliSettings.Default.Protocol);
+            CurrentWallet = nep6wallet;
+
         }
 
 

neo3-gui/neo3-gui/Common/Scanners/ExecuteResultScanner.cs

@@ -86,59 +86,89 @@ public async Task<bool> Sync(uint blockHeight)
                 return true;
             }
 
-
             var block = blockHeight.GetBlock();
             var blockTime = block.Timestamp.FromTimestampMS();
             if (blockHeight == 0)
             {
                 SyncNativeContracts(blockTime);
             }
 
-            if (block.Transactions.Length == 0)
+            bool hasTxs = block.Transactions.Length > 0;
+            if (hasTxs)
             {
-                _db.AddSyncIndex(blockHeight);
-                return true;
+                SyncContracts(blockHeight, blockTime);
+                foreach (var transaction in block.Transactions)
+                {
+                    _db.AddTransaction(new TransactionInfo()
+                    {
+                        TxId = transaction.Hash,
+                        BlockHeight = blockHeight,
+                        Sender = transaction.Sender,
+                        Time = blockTime,
+                    });
+                }
+                var transfers = new List<TransferInfo>();
+                var transferItems = _levelDb.GetTransfers(blockHeight);
+                if (transferItems.NotEmpty())
+                {
+                    foreach (var item in transferItems.Where(t => t.TxId != null))
+                    {
+                        transfers.Add(new TransferInfo()
+                        {
+                            BlockHeight = blockHeight,
+                            TimeStamp = block.Timestamp,
+                            TxId = item.TxId,
+                            From = item.From,
+                            To = item.To,
+                            Amount = item.Amount,
+                            Asset = item.Asset,
+                            Trigger = item.Trigger,
+                            TokenId = item.TokenId
+                        });
+                    }
+                }
+                foreach (var transferInfo in transfers)
+                {
+                    _db.AddTransfer(transferInfo);
+                }
             }
+            SyncBalanceChanges(blockHeight);
 
-            SyncContracts(blockHeight, blockTime);
+            _db.AddSyncIndex(blockHeight);
 
-            foreach (var transaction in block.Transactions)
+            CommitAndReset(hasTxs);
+            if (hasTxs)
             {
-                _db.AddTransaction(new TransactionInfo()
-                {
-                    TxId = transaction.Hash,
-                    BlockHeight = blockHeight,
-                    Sender = transaction.Sender,
-                    Time = blockTime,
-                });
+                Console.WriteLine($"Synced:{_scanHeight}[{block.Transactions.Length}]");
             }
+            return true;
+        }
+
 
-            var transfers = new List<TransferInfo>();
-            var transferItems = _levelDb.GetTransfers(blockHeight);
-            if (transferItems.NotEmpty())
+        private void CommitAndReset(bool immediate)
+        {
+            var deadline = _db.LiveTime.TotalSeconds > 15;
+            if (immediate || deadline)
             {
-                foreach (var item in transferItems)
-                {
-                    transfers.Add(new TransferInfo()
-                    {
-                        BlockHeight = blockHeight,
-                        TimeStamp = block.Timestamp,
-                        TxId = item.TxId,
-                        From = item.From,
-                        To = item.To,
-                        Amount = item.Amount,
-                        Asset = item.Asset,
-                        Trigger = item.Trigger,
-                        TokenId = item.TokenId
-                    });
-                }
+                _db.Commit();
             }
-
-            foreach (var transferInfo in transfers)
+            if (deadline)
             {
-                _db.AddTransfer(transferInfo);
+                //release memory
+                _db.Dispose();
+                _db = new TrackDB();
             }
+        }
 
+
+        /// <summary>
+        /// Should run after <see cref="SyncContracts"/> method
+        /// update record will save after call <see cref="_db.Commit()"/> method;
+        /// new record will save immediately
+        /// </summary>
+        /// <param name="blockHeight"></param>
+        private void SyncBalanceChanges(uint blockHeight)
+        {
             var balanceChanges = _levelDb.GetBalancingAccounts(blockHeight);
             if (balanceChanges.NotEmpty())
             {
@@ -148,25 +178,13 @@ public async Task<bool> Sync(uint blockHeight)
                     UpdateBalance(balanceChange.Account, balanceChange.Asset, snapshot);
                 }
             }
-
-            _db.AddSyncIndex(blockHeight);
-            _db.Commit();
-
-            if (block.Transactions.Length > 0)
-            {
-                //Console.WriteLine($"Synced:{_scanHeight}[{block.Transactions.Length}] cost:[{_sw.ElapsedMilliseconds}]");
-                Console.WriteLine($"Synced:{_scanHeight}[{block.Transactions.Length}]");
-            }
-            if (_db.LiveTime.TotalSeconds > 15)
-            {
-                //release memory
-                _db.Dispose();
-                _db = new TrackDB();
-            }
-            return true;
         }
 
 
+        /// <summary>
+        /// sync native contracts state into sqldb immediately
+        /// </summary>
+        /// <param name="blockTime"></param>
         private void SyncNativeContracts(DateTime blockTime)
         {
             foreach (var nativeContract in NativeContract.Contracts)
@@ -194,7 +212,7 @@ private void SyncNativeContracts(DateTime blockTime)
         }
 
         /// <summary>
-        /// sync contract create\update\delete state
+        /// sync contract create\update\delete state into sqldb immediately
         /// </summary>
         /// <param name="blockHeight"></param>
         /// <param name="blockTime"></param>
@@ -294,7 +312,13 @@ private Dictionary<UInt160, HashSet<string>> GetInvokeMethods(Transaction tx)
         }
 
 
-
+        /// <summary>
+        /// update record will save after call <see cref="_db.Commit()"/> method;
+        /// new record will save immediately
+        /// </summary>
+        /// <param name="account"></param>
+        /// <param name="asset"></param>
+        /// <param name="snapshot"></param>
         private void UpdateBalance(UInt160 account, UInt160 asset, DataCache snapshot)
         {
             try