Merge branch 'neo-project:master' into master

neo-ngd · Jan 9, 2023 · 105e849 · 105e849
2 parents a985eb3 + bf5dcba
commit 105e849
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
 
 env:
-  DOTNET_VERSION: 6.0.x
+  DOTNET_VERSION: 7.0.x
 
 jobs:
 

diff --git a/benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj b/benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Neo</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,7 +5,7 @@
     <Copyright>2015-2022 The Neo Project</Copyright>
     <VersionPrefix>3.5.0</VersionPrefix>
     <Authors>The Neo Project</Authors>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PackageProjectUrl>https://github.com/neo-project/neo</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>

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

diff --git a/src/Neo/SmartContract/Native/ContractManagement.cs b/src/Neo/SmartContract/Native/ContractManagement.cs
@@ -116,6 +116,7 @@ internal override async ContractTask OnPersist(ApplicationEngine engine)
                     Hash = contract.Hash,
                     Manifest = contract.Manifest
                 }));
+                engine.Snapshot.Add(CreateStorageKey(Prefix_ContractHash).AddBigEndian(contract.Id), new StorageItem(contract.Hash.ToArray()));
                 await contract.Initialize(engine);
             }
         }

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -2,15 +2,15 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <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="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.1" />
     <PackageReference Include="coverlet.collector" Version="3.2.0" />
   </ItemGroup>
 

diff --git a/tests/Neo.UnitTests/Neo.UnitTests.csproj b/tests/Neo.UnitTests/Neo.UnitTests.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit" Version="1.4.46" />
-    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.4.46" />
-    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="Akka.TestKit" Version="1.4.47" />
+    <PackageReference Include="Akka.TestKit.Xunit2" Version="1.4.47" />
+    <PackageReference Include="Moq" Version="4.18.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Neo.UnitTests/SmartContract/UT_KeyBuilder.cs b/tests/Neo.UnitTests/SmartContract/UT_KeyBuilder.cs
@@ -6,7 +6,7 @@ namespace Neo.UnitTests.SmartContract
     [TestClass]
     public class UT_KeyBuilder
     {
-        private struct a
+        private struct A
         {
             public int x;
         }
@@ -28,11 +28,11 @@ public void Test()
             Assert.AreEqual("010000000203040000000000000000000000000000000000000000", key.ToArray().ToHexString());
 
             key = new KeyBuilder(1, 2);
-            key = key.Add(new a() { x = 123 });
+            key = key.Add(new A() { x = 123 });
             Assert.AreEqual("01000000027b000000", key.ToArray().ToHexString());
 
             key = new KeyBuilder(1, 0);
-            key = key.AddBigEndian(new a() { x = 1 });
+            key = key.AddBigEndian(new A() { x = 1 });
             Assert.AreEqual("010000000000000001", key.ToArray().ToHexString());
         }
     }

diff --git a/tests/Neo.UnitTests/Wallets/UT_KeyPair.cs b/tests/Neo.UnitTests/Wallets/UT_KeyPair.cs
@@ -98,8 +98,9 @@ public void TestGetHashCode()
         {
             byte[] privateKey = { 0x01,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
                 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
-            KeyPair keyPair = new KeyPair(privateKey);
-            keyPair.GetHashCode().Should().Be(1544360595);
+            KeyPair keyPair1 = new KeyPair(privateKey);
+            KeyPair keyPair2 = new KeyPair(privateKey);
+            keyPair1.GetHashCode().Should().Be(keyPair2.GetHashCode());
         }
 
         [TestMethod]