Merge https://github.com/neo-project/neo

neo-ngd · Dec 14, 2022 · a985eb3 · a985eb3
2 parents ec73b0d + f88d4f8
commit a985eb3
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 28 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <Copyright>2015-2022 The Neo Project</Copyright>
-    <VersionPrefix>3.4.0</VersionPrefix>
+    <VersionPrefix>3.5.0</VersionPrefix>
     <Authors>The Neo Project</Authors>
     <TargetFramework>net6.0</TargetFramework>
     <PackageProjectUrl>https://github.com/neo-project/neo</PackageProjectUrl>

diff --git a/src/Neo/Neo.csproj b/src/Neo/Neo.csproj
@@ -10,10 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.4.40" />
+    <PackageReference Include="Akka" Version="1.4.46" />
     <PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.2.16" />
-    <PackageReference Include="Neo.VM" Version="3.4.0" />
+    <PackageReference Include="Neo.VM" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Neo/Plugins/Plugin.cs b/src/Neo/Plugins/Plugin.cs
@@ -73,10 +73,12 @@ static Plugin()
             {
                 EnableRaisingEvents = true,
                 IncludeSubdirectories = true,
-                NotifyFilter = NotifyFilters.CreationTime | NotifyFilters.LastWrite | NotifyFilters.Size,
+                NotifyFilter = NotifyFilters.FileName | NotifyFilters.DirectoryName | NotifyFilters.CreationTime | NotifyFilters.LastWrite | NotifyFilters.Size,
             };
             configWatcher.Changed += ConfigWatcher_Changed;
             configWatcher.Created += ConfigWatcher_Changed;
+            configWatcher.Renamed += ConfigWatcher_Changed;
+            configWatcher.Deleted += ConfigWatcher_Changed;
             AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
         }
 
@@ -102,20 +104,8 @@ private static void ConfigWatcher_Changed(object sender, FileSystemEventArgs e)
             switch (GetExtension(e.Name))
             {
                 case ".json":
-                    try
-                    {
-                        Plugins.FirstOrDefault(p => p.ConfigFile == e.FullPath)?.Configure();
-                    }
-                    catch (FormatException) { }
-                    break;
                 case ".dll":
-                    if (e.ChangeType != WatcherChangeTypes.Created) return;
-                    if (GetDirectoryName(GetDirectoryName(e.FullPath)) != PluginsDirectory) return;
-                    try
-                    {
-                        LoadPlugin(Assembly.Load(File.ReadAllBytes(e.FullPath)));
-                    }
-                    catch { }
+                    Utility.Log(nameof(Plugin), LogLevel.Warning, $"File {e.Name} is {e.ChangeType}, please restart node.");
                     break;
             }
         }

diff --git a/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs b/src/Neo/SmartContract/ApplicationEngine.OpCodePrices.cs
@@ -26,6 +26,8 @@ partial class ApplicationEngine
             [OpCode.PUSHINT64] = 1 << 0,
             [OpCode.PUSHINT128] = 1 << 2,
             [OpCode.PUSHINT256] = 1 << 2,
+            [OpCode.PUSHT] = 1 << 0,
+            [OpCode.PUSHF] = 1 << 0,
             [OpCode.PUSHA] = 1 << 2,
             [OpCode.PUSHNULL] = 1 << 0,
             [OpCode.PUSHDATA1] = 1 << 3,

diff --git a/src/Neo/SmartContract/ApplicationEngine.Runtime.cs b/src/Neo/SmartContract/ApplicationEngine.Runtime.cs
@@ -206,7 +206,7 @@ protected internal void RuntimeLoadScript(byte[] script, CallFlags callFlags, Ar
                 throw new ArgumentOutOfRangeException(nameof(callFlags));
 
             ExecutionContextState state = CurrentContext.GetState<ExecutionContextState>();
-            ExecutionContext context = LoadScript(script, configureState: p =>
+            ExecutionContext context = LoadScript(new Script(script, true), configureState: p =>
             {
                 p.CallingContext = CurrentContext;
                 p.CallFlags = callFlags & state.CallFlags & CallFlags.ReadOnly;

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Neo.UnitTests/Neo.UnitTests.csproj b/tests/Neo.UnitTests/Neo.UnitTests.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit" Version="1.4.40" />
-    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.4.40" />
+    <PackageReference Include="Akka.TestKit" Version="1.4.46" />
+    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.4.46" />
     <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>
 

diff --git a/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs b/tests/Neo.UnitTests/SmartContract/Native/UT_StdLib.cs
@@ -290,7 +290,7 @@ public void Json_Serialize()
                 Assert.IsTrue(engine.ResultStack.Pop<ByteString>().GetString() == "{\"key\":\"value\"}");
                 Assert.IsTrue(engine.ResultStack.Pop<ByteString>().GetString() == "null");
                 Assert.IsTrue(engine.ResultStack.Pop<ByteString>().GetString() == "\"test\"");
-                Assert.IsTrue(engine.ResultStack.Pop<ByteString>().GetString() == "1");
+                Assert.IsTrue(engine.ResultStack.Pop<ByteString>().GetString() == "true");
                 Assert.IsTrue(engine.ResultStack.Pop<ByteString>().GetString() == "5");
             }
 

diff --git a/tests/Neo.UnitTests/VM/UT_Helper.cs b/tests/Neo.UnitTests/VM/UT_Helper.cs
@@ -137,7 +137,7 @@ public void TestEmitAppCall3()
             ScriptBuilder sb = new ScriptBuilder();
             sb.EmitDynamicCall(UInt160.Zero, "AAAAA", true);
             byte[] tempArray = new byte[38];
-            tempArray[0] = (byte)OpCode.PUSH1;
+            tempArray[0] = (byte)OpCode.PUSHT;
             tempArray[1] = (byte)OpCode.PUSH1;//arg.Length 
             tempArray[2] = (byte)OpCode.PACK;
             tempArray[3] = (byte)OpCode.PUSH15;//(byte)CallFlags.All;
@@ -344,7 +344,7 @@ private void TestEmitPush2Boolean()
             ScriptBuilder sb = new ScriptBuilder();
             sb.EmitPush(new ContractParameter(ContractParameterType.Boolean));
             byte[] tempArray = new byte[1];
-            tempArray[0] = (byte)OpCode.PUSH0;
+            tempArray[0] = (byte)OpCode.PUSHF;
             CollectionAssert.AreEqual(tempArray, sb.ToArray());
         }
 
@@ -531,7 +531,7 @@ private void TestEmitPush3Bool()
             ScriptBuilder sb = new ScriptBuilder();
             sb.EmitPush(true);
             byte[] tempArray = new byte[1];
-            tempArray[0] = (byte)OpCode.PUSH1;
+            tempArray[0] = (byte)OpCode.PUSHT;
             CollectionAssert.AreEqual(tempArray, sb.ToArray());
         }
 
@@ -541,7 +541,7 @@ public void TestEmitSysCall()
             ScriptBuilder sb = new ScriptBuilder();
             sb.EmitSysCall(0, true);
             byte[] tempArray = new byte[6];
-            tempArray[0] = (byte)OpCode.PUSH1;
+            tempArray[0] = (byte)OpCode.PUSHT;
             tempArray[1] = (byte)OpCode.SYSCALL;
             tempArray[2] = 0x00;
             tempArray[3] = 0x00;