Sync with neo (neo-project#465)

* [RpcServer] Querying contracts by ID/name (neo-project#378) * fixed-bug-1021 * Update src/RpcServer/RpcServer.SmartContract.cs * 😂 * draft * draft * update * fixed bug with decimal of GAS consumed in invokefunction/invokescript * remove modify of invokescript * Querying contracts by ID/name, server side * update * Enable using native.name for search Enable using native.name for search * Using keyword instead of addressOrScriptHash * revert * _initialize * split * update * Update exception message in ApplicationLog * Update src/ApplicationLogs/LogReader.cs Co-authored-by: Luchuan <luchuan@ngd.neo.org> * update * a * More fix * fix * Fixed UT * Simplify Code * Simplify Code 2 * Update RpcServer * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> * MPT in StateService from core (neo-project#410) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal (neo-project#413) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal * fix * Fixed UT (Neo CI01089) (neo-project#416) * [RpcServer] Querying contracts by ID/name (neo-project#378) * fixed-bug-1021 * Update src/RpcServer/RpcServer.SmartContract.cs * 😂 * draft * draft * update * fixed bug with decimal of GAS consumed in invokefunction/invokescript * remove modify of invokescript * Querying contracts by ID/name, server side * update * Enable using native.name for search Enable using native.name for search * Using keyword instead of addressOrScriptHash * revert * _initialize * split * update * Update exception message in ApplicationLog * Update src/ApplicationLogs/LogReader.cs Co-authored-by: Luchuan <luchuan@ngd.neo.org> * update * a * More fix * fix * Fixed UT * Simplify Code * Simplify Code 2 * Update RpcServer * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> * MPT in StateService from core (neo-project#410) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal (neo-project#413) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal * fix * Fixed UT (Neo CI01089) Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> Co-authored-by: ZhangTao <ztgoforit@163.com> * Nep17 (neo-project#412) * [RpcServer] Querying contracts by ID/name (neo-project#378) * fixed-bug-1021 * Update src/RpcServer/RpcServer.SmartContract.cs * 😂 * draft * draft * update * fixed bug with decimal of GAS consumed in invokefunction/invokescript * remove modify of invokescript * Querying contracts by ID/name, server side * update * Enable using native.name for search Enable using native.name for search * Using keyword instead of addressOrScriptHash * revert * _initialize * split * update * Update exception message in ApplicationLog * Update src/ApplicationLogs/LogReader.cs Co-authored-by: Luchuan <luchuan@ngd.neo.org> * update * a * More fix * fix * Fixed UT * Simplify Code * Simplify Code 2 * Update RpcServer * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> * String Substitution * Modify filename and name methods * update * update * Update src/RpcClient/Models/RpcNep5TokenInfo.cs Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> * Update src/RpcClient/Nep17API.cs Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> * MPT in StateService from core (neo-project#410) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal (neo-project#413) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal * fix * Fixed UT (Neo CI01089) * Update Nep17API.cs * Update README.md Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> * update filename * Fix UT * Format * fix * update * update UT * Add Unit Tests * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> Co-authored-by: ZhangTao <ztgoforit@163.com> * merge * clear * Transfer bug fix (neo-project#429) * [RpcServer] Querying contracts by ID/name (neo-project#378) * fixed-bug-1021 * Update src/RpcServer/RpcServer.SmartContract.cs * 😂 * draft * draft * update * fixed bug with decimal of GAS consumed in invokefunction/invokescript * remove modify of invokescript * Querying contracts by ID/name, server side * update * Enable using native.name for search Enable using native.name for search * Using keyword instead of addressOrScriptHash * revert * _initialize * split * update * Update exception message in ApplicationLog * Update src/ApplicationLogs/LogReader.cs Co-authored-by: Luchuan <luchuan@ngd.neo.org> * update * a * More fix * fix * Fixed UT * Simplify Code * Simplify Code 2 * Update RpcServer * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> * MPT in StateService from core (neo-project#410) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal (neo-project#413) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal * fix * Fixed UT (Neo CI01089) (neo-project#416) * [RpcServer] Querying contracts by ID/name (neo-project#378) * fixed-bug-1021 * Update src/RpcServer/RpcServer.SmartContract.cs * 😂 * draft * draft * update * fixed bug with decimal of GAS consumed in invokefunction/invokescript * remove modify of invokescript * Querying contracts by ID/name, server side * update * Enable using native.name for search Enable using native.name for search * Using keyword instead of addressOrScriptHash * revert * _initialize * split * update * Update exception message in ApplicationLog * Update src/ApplicationLogs/LogReader.cs Co-authored-by: Luchuan <luchuan@ngd.neo.org> * update * a * More fix * fix * Fixed UT * Simplify Code * Simplify Code 2 * Update RpcServer * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> * MPT in StateService from core (neo-project#410) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal (neo-project#413) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal * fix * Fixed UT (Neo CI01089) Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> Co-authored-by: ZhangTao <ztgoforit@163.com> * Nep17 (neo-project#412) * [RpcServer] Querying contracts by ID/name (neo-project#378) * fixed-bug-1021 * Update src/RpcServer/RpcServer.SmartContract.cs * 😂 * draft * draft * update * fixed bug with decimal of GAS consumed in invokefunction/invokescript * remove modify of invokescript * Querying contracts by ID/name, server side * update * Enable using native.name for search Enable using native.name for search * Using keyword instead of addressOrScriptHash * revert * _initialize * split * update * Update exception message in ApplicationLog * Update src/ApplicationLogs/LogReader.cs Co-authored-by: Luchuan <luchuan@ngd.neo.org> * update * a * More fix * fix * Fixed UT * Simplify Code * Simplify Code 2 * Update RpcServer * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> * String Substitution * Modify filename and name methods * update * update * Update src/RpcClient/Models/RpcNep5TokenInfo.cs Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> * Update src/RpcClient/Nep17API.cs Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> * MPT in StateService from core (neo-project#410) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal (neo-project#413) * Unify GetUnclaimedGas and GetWalletUnclaimedGas with decimal * fix * Fixed UT (Neo CI01089) * Update Nep17API.cs * Update README.md Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> * update filename * Fix UT * Format * fix * update * update UT * Add Unit Tests * update Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> Co-authored-by: ZhangTao <ztgoforit@163.com> * merge * fixed bug * clear * UT * Add a little code coverage Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> Co-authored-by: ZhangTao <ztgoforit@163.com> * Preview4 (neo-project#430) * Preview4 * Remove syslog in README.md * dotnet 5.0 (neo-project#407) * CI01123 (neo-project#435) * Fix dotnet5 (neo-project#442) * Sync neo * Update RpcTestCases.json * Update RpcServer.Wallet.cs Co-authored-by: 陈志同 <chenzhitong12@hotmail.com> Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Co-authored-by: superboyiii <573504781@qq.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Luchuan <luchuan@ngd.neo.org> Co-authored-by: ZhangTao <ztgoforit@163.com> Co-authored-by: 陈志同 <bitcoin2077@outlook.com> Co-authored-by: Erik Zhang <erik@neo.org> Co-authored-by: Shine Li <bfshm@qq.com> Co-authored-by: 陈志同 <chenzhitong12@qq.com>
joeqian10 · Apr 7, 2021 · 7afe150 · 7afe150
1 parent 7bb8261
commit 7afe150
Show file tree

Hide file tree

Showing 8 changed files with 469 additions and 483 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI01152" />
+    <PackageReference Include="Neo" Version="3.0.0-CI01159" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OracleService/OracleService.cs b/src/OracleService/OracleService.cs
@@ -341,7 +341,7 @@ public static Transaction CreateResponseTx(StoreView snapshot, OracleRequest req
 
             var oracleContract = NativeContract.ContractManagement.GetContract(snapshot, NativeContract.Oracle.Hash);
             var engine = ApplicationEngine.Create(TriggerType.Verification, tx, snapshot.Clone());
-            engine.LoadContract(oracleContract, "verify", CallFlags.None, true, 0);
+            engine.LoadContract(oracleContract, "verify", CallFlags.None, true);
             engine.Push("verify");
             if (engine.Execute() != VMState.HALT) return null;
             tx.NetworkFee += engine.GasConsumed;

diff --git a/src/RpcClient/Models/RpcContractState.cs b/src/RpcClient/Models/RpcContractState.cs
@@ -1,32 +1,31 @@
-using Neo;
-using Neo.IO;
 using Neo.IO.Json;
-using Neo.Network.RPC.Models;
 using Neo.SmartContract;
 using Neo.SmartContract.Manifest;
-using System;
 
-public class RpcContractState
+namespace Neo.Network.RPC.Models
 {
-    public ContractState ContractState { get; set; }
-
-    public JObject ToJson()
+    public class RpcContractState
     {
-        return ContractState.ToJson();
-    }
+        public ContractState ContractState { get; set; }
 
-    public static RpcContractState FromJson(JObject json)
-    {
-        return new RpcContractState
+        public JObject ToJson()
+        {
+            return ContractState.ToJson();
+        }
+
+        public static RpcContractState FromJson(JObject json)
         {
-            ContractState = new ContractState
+            return new RpcContractState
             {
-                Id = (int)json["id"].AsNumber(),
-                UpdateCounter = (ushort)json["updatecounter"].AsNumber(),
-                Hash = UInt160.Parse(json["hash"].AsString()),
-                Nef = RpcNefFile.FromJson(json["nef"]),
-                Manifest = ContractManifest.FromJson(json["manifest"])
-            }
-        };
+                ContractState = new ContractState
+                {
+                    Id = (int)json["id"].AsNumber(),
+                    UpdateCounter = (ushort)json["updatecounter"].AsNumber(),
+                    Hash = UInt160.Parse(json["hash"].AsString()),
+                    Nef = RpcNefFile.FromJson(json["nef"]),
+                    Manifest = ContractManifest.FromJson(json["manifest"])
+                }
+            };
+        }
     }
 }
diff --git a/src/RpcClient/Models/RpcInvokeResult.cs b/src/RpcClient/Models/RpcInvokeResult.cs
@@ -1,10 +1,8 @@
 using Neo.IO.Json;
-using Neo.SmartContract.Native;
 using Neo.VM;
 using Neo.VM.Types;
 using System;
 using System.Linq;
-using System.Numerics;
 
 namespace Neo.Network.RPC.Models
 {

diff --git a/src/RpcClient/Models/RpcMethodToken.cs b/src/RpcClient/Models/RpcMethodToken.cs
@@ -1,10 +1,6 @@
 using Neo.IO.Json;
 using Neo.SmartContract;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Neo.Network.RPC.Models
 {

diff --git a/src/RpcClient/Models/RpcNefFile.cs b/src/RpcClient/Models/RpcNefFile.cs
@@ -1,10 +1,7 @@
 using Neo.IO.Json;
 using Neo.SmartContract;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Neo.Network.RPC.Models
 {
@@ -15,7 +12,6 @@ public static NefFile FromJson(JObject json)
             return new NefFile
             {
                 Compiler = json["compiler"].AsString(),
-                Version = json["version"].AsString(),
                 Tokens = ((JArray)json["tokens"]).Select(p => RpcMethodToken.FromJson(p)).ToArray(),
                 Script = Convert.FromBase64String(json["script"].AsString()),
                 CheckSum = (uint)json["checksum"].AsNumber()

diff --git a/src/RpcServer/RpcServer.Wallet.cs b/src/RpcServer/RpcServer.Wallet.cs
@@ -355,7 +355,7 @@ private JObject GetVerificationResult(UInt160 scriptHash, ContractParameter[] ar
             tx.Witnesses = context.Completed ? context.GetWitnesses() : null;
 
             using ApplicationEngine engine = ApplicationEngine.Create(TriggerType.Verification, tx, snapshot.Clone());
-            engine.LoadScript(new ScriptBuilder().EmitDynamicCall(scriptHash, methodName, args).ToArray(), (ushort)args.Length, 1);
+            engine.LoadScript(new ScriptBuilder().EmitDynamicCall(scriptHash, methodName, args).ToArray(), rvcount: 1);
 
             JObject json = new JObject();
             json["script"] = Convert.ToBase64String(contract.Script);