Sync to CI01133

neo-cli/CLI/MainService.Vote.cs

@@ -43,7 +43,7 @@ private void OnRegisterCandidateCommand(UInt160 account)
             byte[] script;
             using (ScriptBuilder scriptBuilder = new ScriptBuilder())
             {
-                scriptBuilder.EmitAppCall(NativeContract.NEO.Hash, "registerCandidate", publicKey);
+                scriptBuilder.EmitDynamicCall(NativeContract.NEO.Hash, "registerCandidate", true, publicKey);
                 script = scriptBuilder.ToArray();
             }
 
@@ -83,7 +83,7 @@ private void OnUnregisterCandidateCommand(UInt160 account)
             byte[] script;
             using (ScriptBuilder scriptBuilder = new ScriptBuilder())
             {
-                scriptBuilder.EmitAppCall(NativeContract.NEO.Hash, "unregisterCandidate", publicKey);
+                scriptBuilder.EmitDynamicCall(NativeContract.NEO.Hash, "unregisterCandidate", true, publicKey);
                 script = scriptBuilder.ToArray();
             }
 
@@ -107,7 +107,7 @@ private void OnVoteCommand(UInt160 senderAccount, ECPoint publicKey)
             byte[] script;
             using (ScriptBuilder scriptBuilder = new ScriptBuilder())
             {
-                scriptBuilder.EmitAppCall(NativeContract.NEO.Hash, "vote", senderAccount, publicKey);
+                scriptBuilder.EmitDynamicCall(NativeContract.NEO.Hash, "vote", true, senderAccount, publicKey);
                 script = scriptBuilder.ToArray();
             }
 

neo-cli/CLI/MainService.cs

@@ -282,7 +282,7 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,
 
             using (ScriptBuilder sb = new ScriptBuilder())
             {
-                sb.EmitAppCall(NativeContract.ContractManagement.Hash, "deploy", nef.ToArray(), manifest.ToJson().ToString());
+                sb.EmitDynamicCall(NativeContract.ContractManagement.Hash, "deploy", true, nef.ToArray(), manifest.ToJson().ToString());
                 return sb.ToArray();
             }
         }
@@ -525,11 +525,34 @@ private bool OnInvokeWithResult(UInt160 scriptHash, string operation, out StackI
                 }
             }
 
+            bool hasReturnValue;
+            var snapshot = Blockchain.Singleton.GetSnapshot();
+            ContractState contract = NativeContract.ContractManagement.GetContract(snapshot, scriptHash);
+            if (contract == null)
+            {
+                Console.WriteLine("Contract does not exist.");
+                result = StackItem.Null;
+                return false;
+            }
+            else
+            {
+                if (contract.Manifest.Abi.GetMethod(operation) == null)
+                {
+                    Console.WriteLine("This method does not not exist in this contract.");
+                    result = StackItem.Null;
+                    return false;
+                }
+                else
+                {
+                    hasReturnValue = contract.Manifest.Abi.GetMethod(operation).ReturnType != ContractParameterType.Void;
+                }
+            }
+
             byte[] script;
 
             using (ScriptBuilder scriptBuilder = new ScriptBuilder())
             {
-                scriptBuilder.EmitAppCall(scriptHash, operation, parameters.ToArray());
+                scriptBuilder.EmitDynamicCall(scriptHash, operation, hasReturnValue, parameters.ToArray());
                 script = scriptBuilder.ToArray();
                 Console.WriteLine($"Invoking script with: '{script.ToBase64String()}'");
             }

neo-cli/neo-cli.csproj

@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI01125" />
+    <PackageReference Include="Neo" Version="3.0.0-CI01133" />
   </ItemGroup>
 
   <ItemGroup>