update nuget (#283)

* update nuget * remove GasFree * resolve conflict Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
neo-project · Jul 9, 2020 · 40f9180 · 40f9180
1 parent f51432d
commit 40f9180
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
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-CI00962" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00966" />
   </ItemGroup>
 
 </Project>
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-CI00962" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00966" />
     <PackageReference Include="RocksDbNative" Version="6.2.2" />
     <PackageReference Include="RocksDbSharp" Version="6.2.2" />
   </ItemGroup>

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-CI00961" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00966" />
   </ItemGroup>
 
 </Project>
diff --git a/src/RpcClient/TransactionManager.cs b/src/RpcClient/TransactionManager.cs
@@ -75,7 +75,7 @@ public TransactionManager MakeTransaction(byte[] script, TransactionAttribute[]
             // Add witness hashes parameter to pass CheckWitness
             UInt160[] hashes = Tx.GetScriptHashesForVerifying(null);
             RpcInvokeResult result = rpcClient.InvokeScript(script, hashes);
-            Tx.SystemFee = Math.Max(long.Parse(result.GasConsumed) - ApplicationEngine.GasFree, 0);
+            Tx.SystemFee = long.Parse(result.GasConsumed);
             context = new ContractParametersContext(Tx);
             signStore = new List<SignItem>();
 

diff --git a/src/RpcNep5Tracker/RpcNep5Tracker.cs b/src/RpcNep5Tracker/RpcNep5Tracker.cs
@@ -176,7 +176,7 @@ public void OnPersist(StoreView snapshot, IReadOnlyList<Blockchain.ApplicationEx
                     script = sb.ToArray();
                 }
 
-                using (ApplicationEngine engine = ApplicationEngine.Run(script, snapshot, extraGAS: 100000000))
+                using (ApplicationEngine engine = ApplicationEngine.Run(script, snapshot, gas: 100000000))
                 {
                     if (engine.State.HasFlag(VMState.FAULT)) continue;
                     if (engine.ResultStack.Count <= 0) continue;

diff --git a/src/RpcServer/RpcServer.SmartContract.cs b/src/RpcServer/RpcServer.SmartContract.cs
@@ -61,7 +61,7 @@ public void SerializeUnsigned(BinaryWriter writer)
 
         private JObject GetInvokeResult(byte[] script, Cosigners cosigners = null)
         {
-            using ApplicationEngine engine = ApplicationEngine.Run(script, cosigners, extraGAS: settings.MaxGasInvoke);
+            using ApplicationEngine engine = ApplicationEngine.Run(script, cosigners, gas: settings.MaxGasInvoke);
             JObject json = new JObject();
             json["script"] = script.ToHexString();
             json["state"] = engine.State;

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-CI00961" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00966" />
   </ItemGroup>
 
 </Project>
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-CI00958" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00966" />
     <PackageReference Include="Neo.ConsoleService" Version="1.0.0" />
   </ItemGroup>