Check return value of contracts (#1680)

neo-project · Jun 15, 2020 · 835fdee · 835fdee
1 parent b729f79
commit 835fdee
Show file tree

Hide file tree

Showing 16 changed files with 119 additions and 97 deletions.
diff --git a/src/neo/Ledger/Blockchain.cs b/src/neo/Ledger/Blockchain.cs
@@ -91,7 +91,7 @@ static Blockchain()
             using (ScriptBuilder sb = new ScriptBuilder())
             {
                 foreach (NativeContract contract in contracts)
-                    sb.EmitAppCall(contract.Hash, "onPersist");
+                    sb.EmitAppCall(contract.Hash, ContractParameterType.Boolean, "onPersist");
 
                 onPersistNativeContractScript = sb.ToArray();
             }

diff --git a/src/neo/SmartContract/ApplicationEngine.Contract.cs b/src/neo/SmartContract/ApplicationEngine.Contract.cs
@@ -100,19 +100,19 @@ internal void DestroyContract()
                     Snapshot.Storages.Delete(key);
         }
 
-        internal void CallContract(UInt160 contractHash, string method, Array args)
+        internal void CallContract(UInt160 contractHash, ContractParameterType returnType, string method, Array args)
         {
-            CallContractInternal(contractHash, method, args, CallFlags.All);
+            CallContractInternal(contractHash, returnType, method, args, CallFlags.All);
         }
 
-        internal void CallContractEx(UInt160 contractHash, string method, Array args, CallFlags callFlags)
+        internal void CallContractEx(UInt160 contractHash, ContractParameterType returnType, string method, Array args, CallFlags callFlags)
         {
             if ((callFlags & ~CallFlags.All) != 0)
                 throw new ArgumentOutOfRangeException(nameof(callFlags));
-            CallContractInternal(contractHash, method, args, callFlags);
+            CallContractInternal(contractHash, returnType, method, args, callFlags);
         }
 
-        private void CallContractInternal(UInt160 contractHash, string method, Array args, CallFlags flags)
+        private void CallContractInternal(UInt160 contractHash, ContractParameterType returnType, string method, Array args, CallFlags flags)
         {
             if (method.StartsWith('_')) throw new ArgumentException();
 
@@ -140,11 +140,15 @@ private void CallContractInternal(UInt160 contractHash, string method, Array arg
             ContractMethodDescriptor md = contract.Manifest.Abi.GetMethod(method);
             if (md is null) throw new InvalidOperationException();
             if (args.Count != md.Parameters.Length) throw new InvalidOperationException();
-            int rvcount = md.ReturnType == ContractParameterType.Void ? 0 : 1;
-            ExecutionContext context_new = LoadScript(contract.Script, rvcount);
+            if (returnType == ContractParameterType.Void && md.ReturnType != ContractParameterType.Void)
+                throw new InvalidOperationException();
+            if (returnType != ContractParameterType.Any && md.ReturnType != returnType)
+                throw new InvalidOperationException();
+            ExecutionContext context_new = LoadScript(contract.Script);
             state = context_new.GetState<ExecutionContextState>();
             state.CallingScriptHash = callingScriptHash;
             state.CallFlags = flags & callingFlags;
+            state.RVCount = returnType == ContractParameterType.Void ? 0 : 1;
 
             if (NativeContract.IsNative(contractHash))
             {

diff --git a/src/neo/SmartContract/ApplicationEngine.cs b/src/neo/SmartContract/ApplicationEngine.cs
@@ -55,6 +55,15 @@ internal bool AddGas(long gas)
             return testMode || GasConsumed <= gas_amount;
         }
 
+        protected override void ContextUnloaded(ExecutionContext context)
+        {
+            base.ContextUnloaded(context);
+            if (context.EvaluationStack == CurrentContext?.EvaluationStack) return;
+            int rvcount = context.GetState<ExecutionContextState>().RVCount;
+            if (rvcount != -1 && rvcount != context.EvaluationStack.Count)
+                throw new InvalidOperationException();
+        }
+
         protected override void LoadContext(ExecutionContext context)
         {
             // Set default execution context state
@@ -64,9 +73,9 @@ protected override void LoadContext(ExecutionContext context)
             base.LoadContext(context);
         }
 
-        public ExecutionContext LoadScript(Script script, CallFlags callFlags, int rvcount = -1)
+        public ExecutionContext LoadScript(Script script, CallFlags callFlags)
         {
-            ExecutionContext context = LoadScript(script, rvcount);
+            ExecutionContext context = LoadScript(script);
             context.GetState<ExecutionContextState>().CallFlags = callFlags;
             return context;
         }
@@ -123,7 +132,7 @@ internal object Convert(StackItem item, InteropParameterDescriptor descriptor)
             {
                 object value = descriptor.Converter(item);
                 if (descriptor.IsEnum)
-                    value = System.Convert.ChangeType(value, descriptor.Type);
+                    value = Enum.ToObject(descriptor.Type, value);
                 else if (descriptor.IsInterface)
                     value = ((InteropInterface)value).GetInterface<object>();
                 return value;

diff --git a/src/neo/SmartContract/ContractParameterType.cs b/src/neo/SmartContract/ContractParameterType.cs
@@ -2,21 +2,22 @@ namespace Neo.SmartContract
 {
     public enum ContractParameterType : byte
     {
-        Signature = 0x00,
-        Boolean = 0x01,
-        Integer = 0x02,
-        Hash160 = 0x03,
-        Hash256 = 0x04,
-        ByteArray = 0x05,
-        PublicKey = 0x06,
-        String = 0x07,
+        Any = 0x00,
 
-        Array = 0x10,
-        Map = 0x12,
+        Boolean = 0x10,
+        Integer = 0x11,
+        ByteArray = 0x12,
+        String = 0x13,
+        Hash160 = 0x14,
+        Hash256 = 0x15,
+        PublicKey = 0x16,
+        Signature = 0x17,
 
-        InteropInterface = 0xf0,
+        Array = 0x20,
+        Map = 0x22,
+
+        InteropInterface = 0x30,
 
-        Any = 0xfe,
         Void = 0xff
     }
 }
diff --git a/src/neo/SmartContract/ExecutionContextState.cs b/src/neo/SmartContract/ExecutionContextState.cs
@@ -16,5 +16,7 @@ internal class ExecutionContextState
         /// Execution context rights
         /// </summary>
         public CallFlags CallFlags { get; set; } = CallFlags.All;
+
+        public int RVCount { get; set; } = -1;
     }
 }
diff --git a/src/neo/SmartContract/Native/NativeContract.cs b/src/neo/SmartContract/Native/NativeContract.cs
@@ -151,7 +151,7 @@ public ApplicationEngine TestCall(string operation, params object[] args)
         {
             using (ScriptBuilder sb = new ScriptBuilder())
             {
-                sb.EmitAppCall(Hash, operation, args);
+                sb.EmitAppCall(Hash, ContractParameterType.Any, operation, args);
                 return ApplicationEngine.Run(sb.ToArray(), testMode: true);
             }
         }
@@ -170,7 +170,7 @@ private static ContractParameterType ToParameterType(Type type)
             if (type == typeof(ulong)) return ContractParameterType.Integer;
             if (type == typeof(BigInteger)) return ContractParameterType.Integer;
             if (type == typeof(byte[])) return ContractParameterType.ByteArray;
-            if (type == typeof(string)) return ContractParameterType.ByteArray;
+            if (type == typeof(string)) return ContractParameterType.String;
             if (type == typeof(VM.Types.Boolean)) return ContractParameterType.Boolean;
             if (type == typeof(Integer)) return ContractParameterType.Integer;
             if (type == typeof(ByteString)) return ContractParameterType.ByteArray;

diff --git a/src/neo/VM/Helper.cs b/src/neo/VM/Helper.cs
@@ -23,35 +23,38 @@ public static ScriptBuilder Emit(this ScriptBuilder sb, params OpCode[] ops)
             return sb;
         }
 
-        public static ScriptBuilder EmitAppCall(this ScriptBuilder sb, UInt160 scriptHash, string operation)
+        public static ScriptBuilder EmitAppCall(this ScriptBuilder sb, UInt160 scriptHash, ContractParameterType returnType, string operation)
         {
             sb.EmitPush(0);
             sb.Emit(OpCode.NEWARRAY);
             sb.EmitPush(operation);
+            sb.EmitPush(returnType);
             sb.EmitPush(scriptHash);
             sb.EmitSysCall(ApplicationEngine.System_Contract_Call);
             return sb;
         }
 
-        public static ScriptBuilder EmitAppCall(this ScriptBuilder sb, UInt160 scriptHash, string operation, params ContractParameter[] args)
+        public static ScriptBuilder EmitAppCall(this ScriptBuilder sb, UInt160 scriptHash, ContractParameterType returnType, string operation, params ContractParameter[] args)
         {
             for (int i = args.Length - 1; i >= 0; i--)
                 sb.EmitPush(args[i]);
             sb.EmitPush(args.Length);
             sb.Emit(OpCode.PACK);
             sb.EmitPush(operation);
+            sb.EmitPush(returnType);
             sb.EmitPush(scriptHash);
             sb.EmitSysCall(ApplicationEngine.System_Contract_Call);
             return sb;
         }
 
-        public static ScriptBuilder EmitAppCall(this ScriptBuilder sb, UInt160 scriptHash, string operation, params object[] args)
+        public static ScriptBuilder EmitAppCall(this ScriptBuilder sb, UInt160 scriptHash, ContractParameterType returnType, string operation, params object[] args)
         {
             for (int i = args.Length - 1; i >= 0; i--)
                 sb.EmitPush(args[i]);
             sb.EmitPush(args.Length);
             sb.Emit(OpCode.PACK);
             sb.EmitPush(operation);
+            sb.EmitPush(returnType);
             sb.EmitPush(scriptHash);
             sb.EmitSysCall(ApplicationEngine.System_Contract_Call);
             return sb;
@@ -208,14 +211,14 @@ public static string GetString(this StackItem item)
         /// <param name="operation">contract operation</param>
         /// <param name="args">operation arguments</param>
         /// <returns></returns>
-        public static byte[] MakeScript(this UInt160 scriptHash, string operation, params object[] args)
+        public static byte[] MakeScript(this UInt160 scriptHash, ContractParameterType returnType, string operation, params object[] args)
         {
             using (ScriptBuilder sb = new ScriptBuilder())
             {
                 if (args.Length > 0)
-                    sb.EmitAppCall(scriptHash, operation, args);
+                    sb.EmitAppCall(scriptHash, returnType, operation, args);
                 else
-                    sb.EmitAppCall(scriptHash, operation);
+                    sb.EmitAppCall(scriptHash, returnType, operation);
                 return sb.ToArray();
             }
         }

diff --git a/src/neo/Wallets/AssetDescriptor.cs b/src/neo/Wallets/AssetDescriptor.cs
@@ -15,8 +15,8 @@ public AssetDescriptor(UInt160 asset_id)
             byte[] script;
             using (ScriptBuilder sb = new ScriptBuilder())
             {
-                sb.EmitAppCall(asset_id, "decimals");
-                sb.EmitAppCall(asset_id, "name");
+                sb.EmitAppCall(asset_id, ContractParameterType.Integer, "decimals");
+                sb.EmitAppCall(asset_id, ContractParameterType.String, "name");
                 script = sb.ToArray();
             }
             using ApplicationEngine engine = ApplicationEngine.Run(script, extraGAS: 3_000_000);

diff --git a/src/neo/Wallets/Wallet.cs b/src/neo/Wallets/Wallet.cs
@@ -137,10 +137,10 @@ public BigDecimal GetBalance(UInt160 asset_id, params UInt160[] accounts)
                 sb.EmitPush(0);
                 foreach (UInt160 account in accounts)
                 {
-                    sb.EmitAppCall(asset_id, "balanceOf", account);
+                    sb.EmitAppCall(asset_id, ContractParameterType.Integer, "balanceOf", account);
                     sb.Emit(OpCode.ADD);
                 }
-                sb.EmitAppCall(asset_id, "decimals");
+                sb.EmitAppCall(asset_id, ContractParameterType.Integer, "decimals");
                 script = sb.ToArray();
             }
             using ApplicationEngine engine = ApplicationEngine.Run(script, extraGAS: 20000000L * accounts.Length);
@@ -246,7 +246,7 @@ public Transaction MakeTransaction(TransferOutput[] outputs, UInt160 from = null
                         foreach (UInt160 account in accounts)
                             using (ScriptBuilder sb2 = new ScriptBuilder())
                             {
-                                sb2.EmitAppCall(assetId, "balanceOf", account);
+                                sb2.EmitAppCall(assetId, ContractParameterType.Integer, "balanceOf", account);
                                 using (ApplicationEngine engine = ApplicationEngine.Run(sb2.ToArray(), snapshot, testMode: true))
                                 {
                                     if (engine.State.HasFlag(VMState.FAULT))
@@ -265,7 +265,7 @@ public Transaction MakeTransaction(TransferOutput[] outputs, UInt160 from = null
                             cosignerList.UnionWith(balances_used.Select(p => p.Account));
                             foreach (var (account, value) in balances_used)
                             {
-                                sb.EmitAppCall(output.AssetId, "transfer", account, output.ScriptHash, value);
+                                sb.EmitAppCall(output.AssetId, ContractParameterType.Boolean, "transfer", account, output.ScriptHash, value);
                                 sb.Emit(OpCode.ASSERT);
                             }
                         }

diff --git a/src/neo/neo.csproj b/src/neo/neo.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
-    <PackageReference Include="Neo.VM" Version="3.0.0-CI00219" />
+    <PackageReference Include="Neo.VM" Version="3.0.0-CI00224" />
   </ItemGroup>
 
 </Project>