Merge branch 'dev' into feature/improve-stringextensions-exception-messages

Author: Wi1l-B0t

src/Plugins/RpcServer/RpcServer.Blockchain.cs

@@ -100,7 +100,7 @@ protected internal virtual JToken GetBlock(BlockHashOrIndex blockHashOrIndex, bo
             block.NotNull_Or(RpcError.UnknownBlock);
             if (verbose)
             {
-                JObject json = Utility.BlockToJson(block, system.Settings);
+                JObject json = block.ToJson(system.Settings);
                 json["confirmations"] = NativeContract.Ledger.CurrentIndex(snapshot) - block.Index + 1;
                 UInt256 hash = NativeContract.Ledger.GetBlockHash(snapshot, block.Index + 1);
                 if (hash != null)
@@ -369,7 +369,8 @@ protected internal virtual JToken GetRawTransaction(UInt256 hash, bool verbose =
             tx.NotNull_Or(RpcError.UnknownTransaction);
 
             if (!verbose) return Convert.ToBase64String(tx.ToArray());
-            var json = Utility.TransactionToJson(tx!, system.Settings);
+
+            var json = tx!.ToJson(system.Settings);
             if (state is not null)
             {
                 var block = NativeContract.Ledger.GetTrimmedBlock(snapshot, NativeContract.Ledger.GetBlockHash(snapshot, state.BlockIndex));

src/Plugins/RpcServer/RpcServer.Wallet.cs

@@ -774,7 +774,7 @@ private JObject SignAndRelay(DataCache snapshot, Transaction tx)
             {
                 tx.Witnesses = context.GetWitnesses();
                 system.Blockchain.Tell(tx);
-                return Utility.TransactionToJson(tx, system.Settings);
+                return tx.ToJson(system.Settings);
             }
             else
             {

src/Plugins/RpcServer/Utility.cs

@@ -345,8 +345,10 @@ public void TestGetRawTransaction()
             snapshot.Commit();
 
             var result = _rpcServer.GetRawTransaction(tx.Hash, true);
-            var json = Utility.TransactionToJson(tx, _neoSystem.Settings);
+            var json = tx.ToJson(_neoSystem.Settings);
             Assert.AreEqual(json.ToString(), result.ToString());
+            Assert.IsTrue(json.ContainsProperty("sysfee"));
+            Assert.IsTrue(json.ContainsProperty("netfee"));
 
             result = _rpcServer.GetRawTransaction(tx.Hash, false);
             var tx2 = Convert.FromBase64String(result.AsString()).AsSerializable<Transaction>();
@@ -373,7 +375,8 @@ public void TestGetRawTransaction_Confirmed()
 
             // Test verbose
             var resultVerbose = _rpcServer.GetRawTransaction(tx.Hash, true);
-            var expectedJson = Utility.TransactionToJson(tx, _neoSystem.Settings);
+            var expectedJson = tx.ToJson(_neoSystem.Settings);
+
             // Add expected block-related fields
             expectedJson["blockhash"] = block.Hash.ToString();
             expectedJson["confirmations"] = NativeContract.Ledger.CurrentIndex(_neoSystem.StoreView) - block.Index + 1;