From 51ea5a2692cba8c56b935959c65d4d3a5a4f059a Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sat, 11 May 2024 12:27:41 +0800 Subject: [PATCH 1/3] fix CalculateNetworkFee --- src/RpcServer/RpcServer.Wallet.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/RpcServer/RpcServer.Wallet.cs b/src/RpcServer/RpcServer.Wallet.cs index cc552a58a..c3e392727 100644 --- a/src/RpcServer/RpcServer.Wallet.cs +++ b/src/RpcServer/RpcServer.Wallet.cs @@ -128,9 +128,11 @@ protected virtual JToken CalculateNetworkFee(JArray _params) var tx = Convert.FromBase64String(_params[0].AsString()); JObject account = new(); - var networkfee = Wallets.Helper.CalculateNetworkFee( + wallet ??= new DummyWallet(system.Settings); + var networkfee = + Wallets.Helper.CalculateNetworkFee( tx.AsSerializable(), system.StoreView, system.Settings, - wallet is not null ? a => wallet.GetAccount(a).Contract.Script : null); + a => wallet.GetAccount(a).Contract.Script); account["networkfee"] = networkfee.ToString(); return account; } From 3f835fa721bb6cf7edb34fc1782867b2a38487da Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sat, 11 May 2024 12:34:34 +0800 Subject: [PATCH 2/3] fix in another way --- src/RpcServer/RpcServer.Wallet.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/RpcServer/RpcServer.Wallet.cs b/src/RpcServer/RpcServer.Wallet.cs index c3e392727..8b4f4bc92 100644 --- a/src/RpcServer/RpcServer.Wallet.cs +++ b/src/RpcServer/RpcServer.Wallet.cs @@ -128,11 +128,9 @@ protected virtual JToken CalculateNetworkFee(JArray _params) var tx = Convert.FromBase64String(_params[0].AsString()); JObject account = new(); - wallet ??= new DummyWallet(system.Settings); - var networkfee = - Wallets.Helper.CalculateNetworkFee( + var networkfee = Wallets.Helper.CalculateNetworkFee( tx.AsSerializable(), system.StoreView, system.Settings, - a => wallet.GetAccount(a).Contract.Script); + wallet is not null ? a => wallet.GetAccount(a).Contract.Script : _=>null); account["networkfee"] = networkfee.ToString(); return account; } From 47f050d036489dc0539112d65a29e780caa9289e Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sat, 11 May 2024 12:35:00 +0800 Subject: [PATCH 3/3] format --- src/RpcServer/RpcServer.Wallet.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RpcServer/RpcServer.Wallet.cs b/src/RpcServer/RpcServer.Wallet.cs index 8b4f4bc92..8085c1bd3 100644 --- a/src/RpcServer/RpcServer.Wallet.cs +++ b/src/RpcServer/RpcServer.Wallet.cs @@ -130,7 +130,7 @@ protected virtual JToken CalculateNetworkFee(JArray _params) JObject account = new(); var networkfee = Wallets.Helper.CalculateNetworkFee( tx.AsSerializable(), system.StoreView, system.Settings, - wallet is not null ? a => wallet.GetAccount(a).Contract.Script : _=>null); + wallet is not null ? a => wallet.GetAccount(a).Contract.Script : _ => null); account["networkfee"] = networkfee.ToString(); return account; }