v2.9.4

neo-project · Jan 7, 2019 · 64826c0 · 64826c0
1 parent 768b885
commit 64826c0
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 55 deletions.
diff --git a/ApplicationLogs/ApplicationLogs.csproj b/ApplicationLogs/ApplicationLogs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.3</Version>
+    <Version>2.9.4</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.3" />
+    <PackageReference Include="Neo" Version="2.9.4" />
   </ItemGroup>
 
 </Project>
diff --git a/ImportBlocks/ImportBlocks.cs b/ImportBlocks/ImportBlocks.cs
@@ -9,57 +9,14 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Neo.Plugins
 {
     public class ImportBlocks : Plugin
     {
         public ImportBlocks()
         {
-            Task.Run(() =>
-            {
-                const string path_acc = "chain.acc";
-                if (File.Exists(path_acc))
-                    using (FileStream fs = new FileStream(path_acc, FileMode.Open, FileAccess.Read, FileShare.Read))
-                        System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
-                        {
-                            Blocks = GetBlocks(fs)
-                        }).Wait();
-                const string path_acc_zip = path_acc + ".zip";
-                if (File.Exists(path_acc_zip))
-                    using (FileStream fs = new FileStream(path_acc_zip, FileMode.Open, FileAccess.Read, FileShare.Read))
-                    using (ZipArchive zip = new ZipArchive(fs, ZipArchiveMode.Read))
-                    using (Stream zs = zip.GetEntry(path_acc).Open())
-                        System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
-                        {
-                            Blocks = GetBlocks(zs)
-                        }).Wait();
-                var paths = Directory.EnumerateFiles(".", "chain.*.acc", SearchOption.TopDirectoryOnly).Concat(Directory.EnumerateFiles(".", "chain.*.acc.zip", SearchOption.TopDirectoryOnly)).Select(p => new
-                {
-                    FileName = Path.GetFileName(p),
-                    Start = uint.Parse(Regex.Match(p, @"\d+").Value),
-                    IsCompressed = p.EndsWith(".zip")
-                }).OrderBy(p => p.Start);
-                foreach (var path in paths)
-                {
-                    if (path.Start > Blockchain.Singleton.Height + 1) break;
-                    if (path.IsCompressed)
-                        using (FileStream fs = new FileStream(path.FileName, FileMode.Open, FileAccess.Read, FileShare.Read))
-                        using (ZipArchive zip = new ZipArchive(fs, ZipArchiveMode.Read))
-                        using (Stream zs = zip.GetEntry(Path.GetFileNameWithoutExtension(path.FileName)).Open())
-                            System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
-                            {
-                                Blocks = GetBlocks(zs, true)
-                            }).Wait();
-                    else
-                        using (FileStream fs = new FileStream(path.FileName, FileMode.Open, FileAccess.Read, FileShare.Read))
-                            System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
-                            {
-                                Blocks = GetBlocks(fs, true)
-                            }).Wait();
-                }
-            });
+            OnImport();
         }
 
         private static bool CheckMaxOnImportHeight(uint currentImportBlockHeight)
@@ -181,6 +138,52 @@ private bool OnHelp(string[] args)
             return true;
         }
 
+        private async void OnImport()
+        {
+            SuspendNodeStartup();
+            const string path_acc = "chain.acc";
+            if (File.Exists(path_acc))
+                using (FileStream fs = new FileStream(path_acc, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    await System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
+                    {
+                        Blocks = GetBlocks(fs)
+                    });
+            const string path_acc_zip = path_acc + ".zip";
+            if (File.Exists(path_acc_zip))
+                using (FileStream fs = new FileStream(path_acc_zip, FileMode.Open, FileAccess.Read, FileShare.Read))
+                using (ZipArchive zip = new ZipArchive(fs, ZipArchiveMode.Read))
+                using (Stream zs = zip.GetEntry(path_acc).Open())
+                    await System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
+                    {
+                        Blocks = GetBlocks(zs)
+                    });
+            var paths = Directory.EnumerateFiles(".", "chain.*.acc", SearchOption.TopDirectoryOnly).Concat(Directory.EnumerateFiles(".", "chain.*.acc.zip", SearchOption.TopDirectoryOnly)).Select(p => new
+            {
+                FileName = Path.GetFileName(p),
+                Start = uint.Parse(Regex.Match(p, @"\d+").Value),
+                IsCompressed = p.EndsWith(".zip")
+            }).OrderBy(p => p.Start);
+            foreach (var path in paths)
+            {
+                if (path.Start > Blockchain.Singleton.Height + 1) break;
+                if (path.IsCompressed)
+                    using (FileStream fs = new FileStream(path.FileName, FileMode.Open, FileAccess.Read, FileShare.Read))
+                    using (ZipArchive zip = new ZipArchive(fs, ZipArchiveMode.Read))
+                    using (Stream zs = zip.GetEntry(Path.GetFileNameWithoutExtension(path.FileName)).Open())
+                        await System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
+                        {
+                            Blocks = GetBlocks(zs, true)
+                        });
+                else
+                    using (FileStream fs = new FileStream(path.FileName, FileMode.Open, FileAccess.Read, FileShare.Read))
+                        await System.Blockchain.Ask<Blockchain.ImportCompleted>(new Blockchain.Import
+                        {
+                            Blocks = GetBlocks(fs, true)
+                        });
+            }
+            ResumeNodeStartup();
+        }
+
         protected override bool OnMessage(object message)
         {
             if (!(message is string[] args)) return false;

diff --git a/ImportBlocks/ImportBlocks.csproj b/ImportBlocks/ImportBlocks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.3</Version>
+    <Version>2.9.4</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.3" />
+    <PackageReference Include="Neo" Version="2.9.4" />
   </ItemGroup>
 
 </Project>
diff --git a/RpcSecurity/RpcSecurity.csproj b/RpcSecurity/RpcSecurity.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.3</Version>
+    <Version>2.9.4</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.3" />
+    <PackageReference Include="Neo" Version="2.9.4" />
   </ItemGroup>
 
 </Project>
diff --git a/SimplePolicy/SimplePolicy.csproj b/SimplePolicy/SimplePolicy.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.3</Version>
+    <Version>2.9.4</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
     <LangVersion>latest</LangVersion>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.3" />
+    <PackageReference Include="Neo" Version="2.9.4" />
   </ItemGroup>
 
 </Project>
diff --git a/StatesDumper/StatesDumper.cs b/StatesDumper/StatesDumper.cs
@@ -73,7 +73,7 @@ private bool OnHelp(string[] args)
             return true;
         }
 
-        public void OnPersist(Snapshot snapshot)
+        public void OnPersist(Snapshot snapshot, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
         {
             if (Settings.Default.PersistAction.HasFlag(PersistActions.StorageChanges))
                 OnPersistStorage(snapshot);

diff --git a/StatesDumper/StatesDumper.csproj b/StatesDumper/StatesDumper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>2.9.3</Version>
+    <Version>2.9.4</Version>
     <TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="2.9.3" />
+    <PackageReference Include="Neo" Version="2.9.4" />
   </ItemGroup>
 
 </Project>