Merge branch 'master' into max-block-size

Tommo-L · Jul 25, 2019 · 618d2d9 · 618d2d9
2 parents f622e57 + 34f37b9
commit 618d2d9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/neo/SmartContract/ApplicationEngine.OpCodePrices.cs b/neo/SmartContract/ApplicationEngine.OpCodePrices.cs
@@ -162,8 +162,6 @@ partial class ApplicationEngine
             [OpCode.MIN] = 200,
             [OpCode.MAX] = 200,
             [OpCode.WITHIN] = 200,
-            [OpCode.SHA1] = 300000,
-            [OpCode.SHA256] = 1000000,
             [OpCode.ARRAYSIZE] = 150,
             [OpCode.PACK] = 7000,
             [OpCode.UNPACK] = 7000,

diff --git a/neo/neo.csproj b/neo/neo.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
-    <PackageReference Include="Neo.VM" Version="3.0.0-CI00013" />
+    <PackageReference Include="Neo.VM" Version="3.0.0-CI00030" />
     <PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
   </ItemGroup>