Skip to content

Commit

Permalink
update nuget (#283)
Browse files Browse the repository at this point in the history
* update nuget

* remove GasFree

* resolve conflict

Co-authored-by: Owen Zhang <[email protected]>
  • Loading branch information
cloud8little and superboyiii authored Jul 9, 2020
1 parent f51432d commit 40f9180
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/LevelDBStore/LevelDBStore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-CI00962" />
<PackageReference Include="Neo" Version="3.0.0-CI00966" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/RocksDBStore/RocksDBStore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/RpcClient/RpcClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="3.0.0-CI00961" />
<PackageReference Include="Neo" Version="3.0.0-CI00966" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/RpcClient/TransactionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();

Expand Down
2 changes: 1 addition & 1 deletion src/RpcNep5Tracker/RpcNep5Tracker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/RpcServer/RpcServer.SmartContract.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/RpcServer/RpcServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/StatesDumper/StatesDumper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit 40f9180

Please sign in to comment.