Oracle: Show version in pool (#570)

* Show version in pool

* UpdateChnages

* adapt Dockerfile to recent code changes (#536) (#567)

* Move syscall to native contract

* Start oracle

* Allow start Oracle

* Oracle test

* Show version in pool

* UpdateChnages

* Move syscall to native contract

Co-authored-by: Guil. Sperb Machado <gsm@machados.org>

Dockerfile

@@ -1,6 +1,7 @@
 FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS Build
 
 COPY neo-cli /neo-cli
+COPY Neo.ConsoleService /Neo.ConsoleService
 COPY NuGet.Config /neo-cli
 
 WORKDIR /neo-cli

neo-cli/CLI/MainService.Node.cs

@@ -26,10 +26,10 @@ private void OnShowPoolCommand(bool verbose = false)
  out IEnumerable<Transaction> unverifiedTransactions);
  Console.WriteLine("Verified Transactions:");
  foreach (Transaction tx in verifiedTransactions)
- Console.WriteLine($" {tx.Hash} {tx.GetType().Name} {tx.NetworkFee} GAS_NetFee");
+ Console.WriteLine($" {tx.Hash} {tx.Version.ToString()} {tx.NetworkFee} NetFee");
  Console.WriteLine("Unverified Transactions:");
  foreach (Transaction tx in unverifiedTransactions)
- Console.WriteLine($" {tx.Hash} {tx.GetType().Name} {tx.NetworkFee} GAS_NetFee");
+ Console.WriteLine($" {tx.Hash} {tx.Version.ToString()} {tx.NetworkFee} NetFee");
  }
  Console.WriteLine($"total: {Blockchain.Singleton.MemPool.Count}, verified: {Blockchain.Singleton.MemPool.VerifiedCount}, unverified: {Blockchain.Singleton.MemPool.UnVerifiedCount}");
  }

neo-cli/CLI/MainService.Oracle.cs

@@ -1,5 +1,7 @@
 using Neo.ConsoleService;
+using Neo.Oracle;
 using Neo.SmartContract;
+using Neo.SmartContract.Native;
 using Neo.VM;
 using System;
 
@@ -31,17 +33,16 @@ private void ApplicationEngine_Log(object sender, LogEventArgs e)
  /// Process "oracle test" command
  /// </summary>
  [ConsoleCommand("oracle test", Category = "Oracle Commands")]
- private void OnOracleTest(string url)
+ private void OnOracleTest(string url, OracleWalletBehaviour type = OracleWalletBehaviour.OracleWithoutAssert)
  {
  if (NoWallet()) return;
 
  using ScriptBuilder script = new ScriptBuilder();
 
- script.EmitSysCall(InteropService.Oracle.Neo_Oracle_Get, url, null, null);
+ script.EmitAppCall(NativeContract.Oracle.Hash, "get", url, null, null, null);
  script.EmitSysCall(InteropService.Runtime.Log);
 
- var tx = CurrentWallet.MakeTransaction(script.ToArray(), sender: null, attributes: null, cosigners: null,
- oracle: Oracle.OracleWalletBehaviour.OracleWithoutAssert);
+ var tx = CurrentWallet.MakeTransaction(script.ToArray(), sender: null, attributes: null, cosigners: null, oracle: type);
 
  SignAndSendTx(tx);
  }