Merge branch 'master' into close-230

neo-project · Jun 8, 2020 · 2ef4f8c · 2ef4f8c
2 parents 82ab08a + c51b96b
commit 2ef4f8c
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 8 deletions.
diff --git a/src/ApplicationLogs/LogReader.cs b/src/ApplicationLogs/LogReader.cs
@@ -18,6 +18,8 @@ public class LogReader : Plugin, IPersistencePlugin
 
         public override string Name => "ApplicationLogs";
 
+        public override string Description => "Synchronizes the smart contract log with the NativeContract log (Notify)";
+
         public LogReader()
         {
             db = DB.Open(GetFullPath(Settings.Default.Path), new Options { CreateIfMissing = true });

diff --git a/src/LevelDBStore/LevelDBStore.csproj b/src/LevelDBStore/LevelDBStore.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00929" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00935" />
   </ItemGroup>
 
 </Project>
diff --git a/src/LevelDBStore/Plugins/Storage/LevelDBStore.cs b/src/LevelDBStore/Plugins/Storage/LevelDBStore.cs
@@ -6,6 +6,8 @@ public class LevelDBStore : Plugin, IStoragePlugin
     {
         private string path;
 
+        public override string Description => "Uses LevelDB to store the blockchain data";
+
         protected override void Configure()
         {
             path = string.Format(GetConfiguration().GetSection("Path").Value ?? "Data_LevelDB_{0}", ProtocolSettings.Default.Magic.ToString("X8"));

diff --git a/src/RocksDBStore/Plugins/Storage/RocksDBStore.cs b/src/RocksDBStore/Plugins/Storage/RocksDBStore.cs
@@ -4,6 +4,8 @@ namespace Neo.Plugins.Storage
 {
     public class RocksDBStore : Plugin, IStoragePlugin
     {
+        public override string Description => "Uses RocksDBStore to store the blockchain data";
+
         /// <summary>
         /// Configure
         /// </summary>

diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00929" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00935" />
     <PackageReference Include="RocksDbNative" Version="6.2.2" />
     <PackageReference Include="RocksDbSharp" Version="6.2.2" />
   </ItemGroup>

diff --git a/src/RpcClient/ContractClient.cs b/src/RpcClient/ContractClient.cs
@@ -48,7 +48,7 @@ public Transaction CreateDeployContractTx(byte[] contractScript, ContractManifes
             byte[] script;
             using (ScriptBuilder sb = new ScriptBuilder())
             {
-                sb.EmitSysCall(InteropService.Contract.Create, contractScript, manifest.ToString());
+                sb.EmitSysCall(ApplicationEngine.System_Contract_Create, contractScript, manifest.ToString());
                 script = sb.ToArray();
             }
 

diff --git a/src/RpcClient/RpcClient.csproj b/src/RpcClient/RpcClient.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00929" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00935" />
   </ItemGroup>
 
 </Project>
diff --git a/src/RpcNep5Tracker/RpcNep5Tracker.cs b/src/RpcNep5Tracker/RpcNep5Tracker.cs
@@ -33,6 +33,8 @@ public class RpcNep5Tracker : Plugin, IPersistencePlugin
         private uint _maxResults;
         private Snapshot _levelDbSnapshot;
 
+        public override string Description => "Enquiries NEP-5 balance and transactions history of accounts through RPC";
+
         public RpcNep5Tracker()
         {
             RpcServerPlugin.RegisterMethods(this);

diff --git a/src/RpcServer/RpcServer.csproj b/src/RpcServer/RpcServer.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
-    <PackageReference Include="Neo" Version="3.0.0-CI00929" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00935" />
   </ItemGroup>
 
 </Project>
diff --git a/src/RpcServer/RpcServerPlugin.cs b/src/RpcServer/RpcServerPlugin.cs
@@ -6,6 +6,7 @@ public sealed class RpcServerPlugin : Plugin
     {
         static List<object> handlers = new List<object>();
         public override string Name => "RpcServer";
+        public override string Description => "Enables RPC for the node";
         RpcServer server;
         RpcServerSettings settings;
 

diff --git a/src/StatesDumper/StatesDumper.cs b/src/StatesDumper/StatesDumper.cs
@@ -15,6 +15,8 @@ public class StatesDumper : Plugin, IPersistencePlugin
     {
         private readonly JArray bs_cache = new JArray();
 
+        public override string Description => "Exports Neo-CLI status data";
+
         protected override void Configure()
         {
             Settings.Load(GetConfiguration());

diff --git a/src/StatesDumper/StatesDumper.csproj b/src/StatesDumper/StatesDumper.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00929" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00935" />
     <PackageReference Include="Neo.ConsoleService" Version="1.0.0" />
   </ItemGroup>
 

diff --git a/tests/Neo.Network.RPC.Tests/UT_ContractClient.cs b/tests/Neo.Network.RPC.Tests/UT_ContractClient.cs
@@ -56,7 +56,7 @@ public void TestDeployContract()
             manifest.Features = ContractFeatures.HasStorage | ContractFeatures.Payable;
             using (ScriptBuilder sb = new ScriptBuilder())
             {
-                sb.EmitSysCall(InteropService.Contract.Create, new byte[1], manifest.ToString());
+                sb.EmitSysCall(ApplicationEngine.System_Contract_Create, new byte[1], manifest.ToString());
                 script = sb.ToArray();
             }
 

diff --git a/tests/Neo.Network.RPC.Tests/UT_TransactionManager.cs b/tests/Neo.Network.RPC.Tests/UT_TransactionManager.cs
@@ -121,7 +121,8 @@ public void TestSign()
 
             Assert.IsTrue(Crypto.VerifySignature(tx.GetHashData(), signature, keyPair1.PublicKey));
             // verify network fee and system fee
-            long networkFee = tx.Size * (long)1000 + ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] + ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] + ApplicationEngine.OpCodePrices[OpCode.PUSHNULL] + InteropService.Crypto.VerifyWithECDsaSecp256r1.FixedPrice;
+            long networkFee = tx.Size * (long)1000 + ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] + ApplicationEngine.OpCodePrices[OpCode.PUSHDATA1] + ApplicationEngine.OpCodePrices[OpCode.PUSHNULL] + ApplicationEngine.ECDsaVerifyPrice * 1;
+
             Assert.AreEqual(networkFee, tx.NetworkFee);
             Assert.AreEqual(100, tx.SystemFee);