From bc25b7b06823d0a4d3b9fce370ee4332ad5afa89 Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Thu, 29 Aug 2019 04:34:30 +0800 Subject: [PATCH] Fixes `Transaction.ToJson()` (#1071) * Fixes `Transaction.ToJson()` * Fix tests --- neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs | 2 +- neo/Network/P2P/Payloads/Transaction.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs b/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs index 91510e0ec9..fc32744b96 100644 --- a/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs +++ b/neo.UnitTests/Network/P2P/Payloads/UT_Transaction.cs @@ -1067,7 +1067,7 @@ public void ToJson() ((JArray)jObj["cosigners"]).Count.Should().Be(0); jObj["net_fee"].AsString().Should().Be("0"); jObj["script"].AsString().Should().Be("4220202020202020202020202020202020202020202020202020202020202020"); - jObj["sys_fee"].AsNumber().Should().Be(42); + jObj["sys_fee"].AsString().Should().Be("4200000000"); } } } diff --git a/neo/Network/P2P/Payloads/Transaction.cs b/neo/Network/P2P/Payloads/Transaction.cs index b83cbd977d..a2586e6da2 100644 --- a/neo/Network/P2P/Payloads/Transaction.cs +++ b/neo/Network/P2P/Payloads/Transaction.cs @@ -175,8 +175,8 @@ public JObject ToJson() json["version"] = Version; json["nonce"] = Nonce; json["sender"] = Sender.ToAddress(); - json["sys_fee"] = new BigDecimal(SystemFee, NativeContract.GAS.Decimals).ToString(); - json["net_fee"] = new BigDecimal(NetworkFee, NativeContract.GAS.Decimals).ToString(); + json["sys_fee"] = SystemFee.ToString(); + json["net_fee"] = NetworkFee.ToString(); json["valid_until_block"] = ValidUntilBlock; json["attributes"] = Attributes.Select(p => p.ToJson()).ToArray(); json["cosigners"] = Cosigners.Select(p => p.ToJson()).ToArray();